net: Remove unused netdev arg from some NAPI interfaces.

When the napi api was changed to separate its 1:1 binding to the net_device
struct, the netif_rx_[prep|schedule|complete] api failed to remove the now
vestigual net_device structure parameter.  This patch cleans up that api by
properly removing it..

Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 6 insertions, 9 deletions

diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 1a2780374a49..33d69ddc90a3 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -3043,7 +3043,6 @@ bnx2_msi(int irq, void *dev_instance)
 {
         struct bnx2_napi *bnapi = dev_instance;
         struct bnx2 *bp = bnapi->bp;
-        struct net_device *dev = bp->dev;
 
         prefetch(bnapi->status_blk.msi);
         REG_WR(bp, BNX2_PCICFG_INT_ACK_CMD,
@@ -3054,7 +3053,7 @@ bnx2_msi(int irq, void *dev_instance)
         if (unlikely(atomic_read(&bp->intr_sem) != 0))
                 return IRQ_HANDLED;
 
-        netif_rx_schedule(dev, &bnapi->napi);
+        netif_rx_schedule(&bnapi->napi);
 
         return IRQ_HANDLED;
 }
@@ -3064,7 +3063,6 @@ bnx2_msi_1shot(int irq, void *dev_instance)
 {
         struct bnx2_napi *bnapi = dev_instance;
         struct bnx2 *bp = bnapi->bp;
-        struct net_device *dev = bp->dev;
 
         prefetch(bnapi->status_blk.msi);
 
@@ -3072,7 +3070,7 @@ bnx2_msi_1shot(int irq, void *dev_instance)
         if (unlikely(atomic_read(&bp->intr_sem) != 0))
                 return IRQ_HANDLED;
 
-        netif_rx_schedule(dev, &bnapi->napi);
+        netif_rx_schedule(&bnapi->napi);
 
         return IRQ_HANDLED;
 }
@@ -3082,7 +3080,6 @@ bnx2_interrupt(int irq, void *dev_instance)
 {
         struct bnx2_napi *bnapi = dev_instance;
         struct bnx2 *bp = bnapi->bp;
-        struct net_device *dev = bp->dev;
         struct status_block *sblk = bnapi->status_blk.msi;
 
         /* When using INTx, it is possible for the interrupt to arrive
@@ -3109,9 +3106,9 @@ bnx2_interrupt(int irq, void *dev_instance)
         if (unlikely(atomic_read(&bp->intr_sem) != 0))
                 return IRQ_HANDLED;
 
-        if (netif_rx_schedule_prep(dev, &bnapi->napi)) {
+        if (netif_rx_schedule_prep(&bnapi->napi)) {
                 bnapi->last_status_idx = sblk->status_idx;
-                __netif_rx_schedule(dev, &bnapi->napi);
+                __netif_rx_schedule(&bnapi->napi);
         }
 
         return IRQ_HANDLED;
@@ -3221,7 +3218,7 @@ static int bnx2_poll_msix(struct napi_struct *napi, int budget)
                 rmb();
                 if (likely(!bnx2_has_fast_work(bnapi))) {
 
-                        netif_rx_complete(bp->dev, napi);
+                        netif_rx_complete(napi);
                         REG_WR(bp, BNX2_PCICFG_INT_ACK_CMD, bnapi->int_num |
                                BNX2_PCICFG_INT_ACK_CMD_INDEX_VALID |
                                bnapi->last_status_idx);
@@ -3254,7 +3251,7 @@ static int bnx2_poll(struct napi_struct *napi, int budget)
 
                 rmb();
                 if (likely(!bnx2_has_work(bnapi))) {
-                        netif_rx_complete(bp->dev, napi);
+                        netif_rx_complete(napi);
                         if (likely(bp->flags & BNX2_FLAG_USING_MSI_OR_MSIX)) {
                                 REG_WR(bp, BNX2_PCICFG_INT_ACK_CMD,
                                        BNX2_PCICFG_INT_ACK_CMD_INDEX_VALID |