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/korina.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/korina.c')
-rw-r--r-- | drivers/net/korina.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/korina.c b/drivers/net/korina.c index 75010cac76ac..38d6649a29c4 100644 --- a/drivers/net/korina.c +++ b/drivers/net/korina.c | |||
@@ -334,7 +334,7 @@ static irqreturn_t korina_rx_dma_interrupt(int irq, void *dev_id) | |||
334 | DMA_STAT_HALT | DMA_STAT_ERR), | 334 | DMA_STAT_HALT | DMA_STAT_ERR), |
335 | &lp->rx_dma_regs->dmasm); | 335 | &lp->rx_dma_regs->dmasm); |
336 | 336 | ||
337 | netif_rx_schedule(&lp->napi); | 337 | napi_schedule(&lp->napi); |
338 | 338 | ||
339 | if (dmas & DMA_STAT_ERR) | 339 | if (dmas & DMA_STAT_ERR) |
340 | printk(KERN_ERR DRV_NAME "%s: DMA error\n", dev->name); | 340 | printk(KERN_ERR DRV_NAME "%s: DMA error\n", dev->name); |
@@ -468,7 +468,7 @@ static int korina_poll(struct napi_struct *napi, int budget) | |||
468 | 468 | ||
469 | work_done = korina_rx(dev, budget); | 469 | work_done = korina_rx(dev, budget); |
470 | if (work_done < budget) { | 470 | if (work_done < budget) { |
471 | netif_rx_complete(napi); | 471 | napi_complete(napi); |
472 | 472 | ||
473 | writel(readl(&lp->rx_dma_regs->dmasm) & | 473 | writel(readl(&lp->rx_dma_regs->dmasm) & |
474 | ~(DMA_STAT_DONE | DMA_STAT_HALT | DMA_STAT_ERR), | 474 | ~(DMA_STAT_DONE | DMA_STAT_HALT | DMA_STAT_ERR), |