aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/natsemi.c
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2009-01-19 19:43:59 -0500
committerDavid S. Miller <davem@davemloft.net>2009-01-21 17:33:50 -0500
commit288379f050284087578b77e04f040b57db3db3f8 (patch)
treeac5f5c83e2778a1966327d87316fc94067363b45 /drivers/net/natsemi.c
parent627af770c63acddc2402dd19fec70df5c3ad8ab7 (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/natsemi.c')
-rw-r--r--drivers/net/natsemi.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index c5dec54251bf..c23a58624a33 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -2198,10 +2198,10 @@ static irqreturn_t intr_handler(int irq, void *dev_instance)
2198 2198
2199 prefetch(&np->rx_skbuff[np->cur_rx % RX_RING_SIZE]); 2199 prefetch(&np->rx_skbuff[np->cur_rx % RX_RING_SIZE]);
2200 2200
2201 if (netif_rx_schedule_prep(&np->napi)) { 2201 if (napi_schedule_prep(&np->napi)) {
2202 /* Disable interrupts and register for poll */ 2202 /* Disable interrupts and register for poll */
2203 natsemi_irq_disable(dev); 2203 natsemi_irq_disable(dev);
2204 __netif_rx_schedule(&np->napi); 2204 __napi_schedule(&np->napi);
2205 } else 2205 } else
2206 printk(KERN_WARNING 2206 printk(KERN_WARNING
2207 "%s: Ignoring interrupt, status %#08x, mask %#08x.\n", 2207 "%s: Ignoring interrupt, status %#08x, mask %#08x.\n",
@@ -2253,7 +2253,7 @@ static int natsemi_poll(struct napi_struct *napi, int budget)
2253 np->intr_status = readl(ioaddr + IntrStatus); 2253 np->intr_status = readl(ioaddr + IntrStatus);
2254 } while (np->intr_status); 2254 } while (np->intr_status);
2255 2255
2256 netif_rx_complete(napi); 2256 napi_complete(napi);
2257 2257
2258 /* Reenable interrupts providing nothing is trying to shut 2258 /* Reenable interrupts providing nothing is trying to shut
2259 * the chip down. */ 2259 * the chip down. */