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/cassini.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/cassini.c')
-rw-r--r-- | drivers/net/cassini.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c index 840b3d1a22f5..bb46be275339 100644 --- a/drivers/net/cassini.c +++ b/drivers/net/cassini.c | |||
@@ -2506,7 +2506,7 @@ static irqreturn_t cas_interruptN(int irq, void *dev_id) | |||
2506 | if (status & INTR_RX_DONE_ALT) { /* handle rx separately */ | 2506 | if (status & INTR_RX_DONE_ALT) { /* handle rx separately */ |
2507 | #ifdef USE_NAPI | 2507 | #ifdef USE_NAPI |
2508 | cas_mask_intr(cp); | 2508 | cas_mask_intr(cp); |
2509 | netif_rx_schedule(&cp->napi); | 2509 | napi_schedule(&cp->napi); |
2510 | #else | 2510 | #else |
2511 | cas_rx_ringN(cp, ring, 0); | 2511 | cas_rx_ringN(cp, ring, 0); |
2512 | #endif | 2512 | #endif |
@@ -2557,7 +2557,7 @@ static irqreturn_t cas_interrupt1(int irq, void *dev_id) | |||
2557 | if (status & INTR_RX_DONE_ALT) { /* handle rx separately */ | 2557 | if (status & INTR_RX_DONE_ALT) { /* handle rx separately */ |
2558 | #ifdef USE_NAPI | 2558 | #ifdef USE_NAPI |
2559 | cas_mask_intr(cp); | 2559 | cas_mask_intr(cp); |
2560 | netif_rx_schedule(&cp->napi); | 2560 | napi_schedule(&cp->napi); |
2561 | #else | 2561 | #else |
2562 | cas_rx_ringN(cp, 1, 0); | 2562 | cas_rx_ringN(cp, 1, 0); |
2563 | #endif | 2563 | #endif |
@@ -2613,7 +2613,7 @@ static irqreturn_t cas_interrupt(int irq, void *dev_id) | |||
2613 | if (status & INTR_RX_DONE) { | 2613 | if (status & INTR_RX_DONE) { |
2614 | #ifdef USE_NAPI | 2614 | #ifdef USE_NAPI |
2615 | cas_mask_intr(cp); | 2615 | cas_mask_intr(cp); |
2616 | netif_rx_schedule(&cp->napi); | 2616 | napi_schedule(&cp->napi); |
2617 | #else | 2617 | #else |
2618 | cas_rx_ringN(cp, 0, 0); | 2618 | cas_rx_ringN(cp, 0, 0); |
2619 | #endif | 2619 | #endif |
@@ -2691,7 +2691,7 @@ rx_comp: | |||
2691 | #endif | 2691 | #endif |
2692 | spin_unlock_irqrestore(&cp->lock, flags); | 2692 | spin_unlock_irqrestore(&cp->lock, flags); |
2693 | if (enable_intr) { | 2693 | if (enable_intr) { |
2694 | netif_rx_complete(napi); | 2694 | napi_complete(napi); |
2695 | cas_unmask_intr(cp); | 2695 | cas_unmask_intr(cp); |
2696 | } | 2696 | } |
2697 | return credits; | 2697 | return credits; |