diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2009-01-19 19:43:59 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-01-21 17:33:50 -0500 |
commit | 288379f050284087578b77e04f040b57db3db3f8 (patch) | |
tree | ac5f5c83e2778a1966327d87316fc94067363b45 /drivers/net/r6040.c | |
parent | 627af770c63acddc2402dd19fec70df5c3ad8ab7 (diff) |
net: Remove redundant NAPI functions
Following the removal of the unused struct net_device * parameter from
the NAPI functions named *netif_rx_* in commit 908a7a1, they are
exactly equivalent to the corresponding *napi_* functions and are
therefore redundant.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/r6040.c')
-rw-r--r-- | drivers/net/r6040.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c index 72fd9e97c190..cc0f886b0c29 100644 --- a/drivers/net/r6040.c +++ b/drivers/net/r6040.c | |||
@@ -677,7 +677,7 @@ static int r6040_poll(struct napi_struct *napi, int budget) | |||
677 | work_done = r6040_rx(dev, budget); | 677 | work_done = r6040_rx(dev, budget); |
678 | 678 | ||
679 | if (work_done < budget) { | 679 | if (work_done < budget) { |
680 | netif_rx_complete(napi); | 680 | napi_complete(napi); |
681 | /* Enable RX interrupt */ | 681 | /* Enable RX interrupt */ |
682 | iowrite16(ioread16(ioaddr + MIER) | RX_INTS, ioaddr + MIER); | 682 | iowrite16(ioread16(ioaddr + MIER) | RX_INTS, ioaddr + MIER); |
683 | } | 683 | } |
@@ -714,7 +714,7 @@ static irqreturn_t r6040_interrupt(int irq, void *dev_id) | |||
714 | 714 | ||
715 | /* Mask off RX interrupt */ | 715 | /* Mask off RX interrupt */ |
716 | misr &= ~RX_INTS; | 716 | misr &= ~RX_INTS; |
717 | netif_rx_schedule(&lp->napi); | 717 | napi_schedule(&lp->napi); |
718 | } | 718 | } |
719 | 719 | ||
720 | /* TX interrupt request */ | 720 | /* TX interrupt request */ |