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/8139cp.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/8139cp.c')
-rw-r--r-- | drivers/net/8139cp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c index 4e19ae3ce6be..35517b06ec3f 100644 --- a/drivers/net/8139cp.c +++ b/drivers/net/8139cp.c | |||
@@ -604,7 +604,7 @@ rx_next: | |||
604 | 604 | ||
605 | spin_lock_irqsave(&cp->lock, flags); | 605 | spin_lock_irqsave(&cp->lock, flags); |
606 | cpw16_f(IntrMask, cp_intr_mask); | 606 | cpw16_f(IntrMask, cp_intr_mask); |
607 | __netif_rx_complete(napi); | 607 | __napi_complete(napi); |
608 | spin_unlock_irqrestore(&cp->lock, flags); | 608 | spin_unlock_irqrestore(&cp->lock, flags); |
609 | } | 609 | } |
610 | 610 | ||
@@ -641,9 +641,9 @@ static irqreturn_t cp_interrupt (int irq, void *dev_instance) | |||
641 | } | 641 | } |
642 | 642 | ||
643 | if (status & (RxOK | RxErr | RxEmpty | RxFIFOOvr)) | 643 | if (status & (RxOK | RxErr | RxEmpty | RxFIFOOvr)) |
644 | if (netif_rx_schedule_prep(&cp->napi)) { | 644 | if (napi_schedule_prep(&cp->napi)) { |
645 | cpw16_f(IntrMask, cp_norx_intr_mask); | 645 | cpw16_f(IntrMask, cp_norx_intr_mask); |
646 | __netif_rx_schedule(&cp->napi); | 646 | __napi_schedule(&cp->napi); |
647 | } | 647 | } |
648 | 648 | ||
649 | if (status & (TxOK | TxErr | TxEmpty | SWInt)) | 649 | if (status & (TxOK | TxErr | TxEmpty | SWInt)) |