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/skge.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/skge.c')
-rw-r--r-- | drivers/net/skge.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/skge.c b/drivers/net/skge.c index c9dbb06f8c94..952d37ffee51 100644 --- a/drivers/net/skge.c +++ b/drivers/net/skge.c | |||
@@ -3214,7 +3214,7 @@ static int skge_poll(struct napi_struct *napi, int to_do) | |||
3214 | unsigned long flags; | 3214 | unsigned long flags; |
3215 | 3215 | ||
3216 | spin_lock_irqsave(&hw->hw_lock, flags); | 3216 | spin_lock_irqsave(&hw->hw_lock, flags); |
3217 | __netif_rx_complete(napi); | 3217 | __napi_complete(napi); |
3218 | hw->intr_mask |= napimask[skge->port]; | 3218 | hw->intr_mask |= napimask[skge->port]; |
3219 | skge_write32(hw, B0_IMSK, hw->intr_mask); | 3219 | skge_write32(hw, B0_IMSK, hw->intr_mask); |
3220 | skge_read32(hw, B0_IMSK); | 3220 | skge_read32(hw, B0_IMSK); |
@@ -3377,7 +3377,7 @@ static irqreturn_t skge_intr(int irq, void *dev_id) | |||
3377 | if (status & (IS_XA1_F|IS_R1_F)) { | 3377 | if (status & (IS_XA1_F|IS_R1_F)) { |
3378 | struct skge_port *skge = netdev_priv(hw->dev[0]); | 3378 | struct skge_port *skge = netdev_priv(hw->dev[0]); |
3379 | hw->intr_mask &= ~(IS_XA1_F|IS_R1_F); | 3379 | hw->intr_mask &= ~(IS_XA1_F|IS_R1_F); |
3380 | netif_rx_schedule(&skge->napi); | 3380 | napi_schedule(&skge->napi); |
3381 | } | 3381 | } |
3382 | 3382 | ||
3383 | if (status & IS_PA_TO_TX1) | 3383 | if (status & IS_PA_TO_TX1) |
@@ -3397,7 +3397,7 @@ static irqreturn_t skge_intr(int irq, void *dev_id) | |||
3397 | 3397 | ||
3398 | if (status & (IS_XA2_F|IS_R2_F)) { | 3398 | if (status & (IS_XA2_F|IS_R2_F)) { |
3399 | hw->intr_mask &= ~(IS_XA2_F|IS_R2_F); | 3399 | hw->intr_mask &= ~(IS_XA2_F|IS_R2_F); |
3400 | netif_rx_schedule(&skge->napi); | 3400 | napi_schedule(&skge->napi); |
3401 | } | 3401 | } |
3402 | 3402 | ||
3403 | if (status & IS_PA_TO_RX2) { | 3403 | if (status & IS_PA_TO_RX2) { |