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, 4 insertions, 4 deletions

diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 1b489df80fa6..512861923c6b 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -2852,7 +2852,7 @@ static int s2io_poll_msix(struct napi_struct *napi, int budget)
         s2io_chk_rx_buffers(nic, ring);
 
         if (pkts_processed < budget_org) {
-                netif_rx_complete(dev, napi);
+                netif_rx_complete(napi);
                 /*Re Enable MSI-Rx Vector*/
                 addr = (u8 __iomem *)&bar0->xmsi_mask_reg;
                 addr += 7 - ring->ring_no;
@@ -2890,7 +2890,7 @@ static int s2io_poll_inta(struct napi_struct *napi, int budget)
                         break;
         }
         if (pkts_processed < budget_org) {
-                netif_rx_complete(dev, napi);
+                netif_rx_complete(napi);
                 /* Re enable the Rx interrupts for the ring */
                 writeq(0, &bar0->rx_traffic_mask);
                 readl(&bar0->rx_traffic_mask);
@@ -4344,7 +4344,7 @@ static irqreturn_t s2io_msix_ring_handle(int irq, void *dev_id)
                 val8 = (ring->ring_no == 0) ? 0x7f : 0xff;
                 writeb(val8, addr);
                 val8 = readb(addr);
-                netif_rx_schedule(dev, &ring->napi);
+                netif_rx_schedule(&ring->napi);
         } else {
                 rx_intr_handler(ring, 0);
                 s2io_chk_rx_buffers(sp, ring);
@@ -4791,7 +4791,7 @@ static irqreturn_t s2io_isr(int irq, void *dev_id)
 
                 if (config->napi) {
                         if (reason & GEN_INTR_RXTRAFFIC) {
-                                netif_rx_schedule(dev, &sp->napi);
+                                netif_rx_schedule(&sp->napi);
                                 writeq(S2IO_MINUS_ONE, &bar0->rx_traffic_mask);
                                 writeq(S2IO_MINUS_ONE, &bar0->rx_traffic_int);
                                 readl(&bar0->rx_traffic_int);