net/macb: only probe queues once and use stored values

When merging at91_ether and macb driver during 421d9df0628b (net/macb: merge
at91_ether driver into macb driver) the probe function has been split. The code
dealing with initialization of queues is now moved in macb_init() which needs
information computed in the parent macb_probe() function.
So, add the queue_mask information to the private structure and use it when
needed in macb_init().

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Cc: Cyrille Pitchen <cyrille.pitchen@atmel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index a0a04b3638e6c96efaeab4afecf94bd057b50ed2..ac1f18142f7e603f761ec0bffa1482a5f6bd76d8 100644 (file)
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -2180,7 +2180,7 @@ static void macb_probe_queues(void __iomem *mem,
 static int macb_init(struct platform_device *pdev)
 {
        struct net_device *dev = platform_get_drvdata(pdev);
-       unsigned int hw_q, queue_mask, q, num_queues;
+       unsigned int hw_q, q;
        struct macb *bp = netdev_priv(dev);
        struct macb_queue *queue;
        int err;
@@ -2226,10 +2226,8 @@ static int macb_init(struct platform_device *pdev)
         * register mapping but we don't want to test the queue index then
         * compute the corresponding register offset at run time.
         */
-       macb_probe_queues(bp->regs, &queue_mask, &num_queues);
-
        for (hw_q = 0, q = 0; hw_q < MACB_MAX_QUEUES; ++hw_q) {
-               if (!(queue_mask & (1 << hw_q)))
+               if (!(bp->queue_mask & (1 << hw_q)))
                        continue;
 
                queue = &bp->queues[q];
@@ -2715,6 +2713,7 @@ static int macb_probe(struct platform_device *pdev)
        bp->dev = dev;
        bp->regs = mem;
        bp->num_queues = num_queues;
+       bp->queue_mask = queue_mask;
        spin_lock_init(&bp->lock);
 
        platform_set_drvdata(pdev, dev);

diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h
index bc6e35c408224f5b6438989fdf05097a74a32dd5..0b6afac91bfee60a3a65b519732110e73794ef27 100644 (file)
--- a/drivers/net/ethernet/cadence/macb.h
+++ b/drivers/net/ethernet/cadence/macb.h
@@ -785,6 +785,7 @@ struct macb {
        size_t                  rx_buffer_size;
 
        unsigned int            num_queues;
+       unsigned int            queue_mask;
        struct macb_queue       queues[MACB_MAX_QUEUES];
 
        spinlock_t              lock;