diff options
author | Neil Horman <nhorman@tuxdriver.com> | 2008-12-22 23:43:12 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-22 23:43:12 -0500 |
commit | 908a7a16b852ffd618a9127be8d62432182d81b4 (patch) | |
tree | a0b509227e26bef7edd347575761e0dbeb5756e7 /drivers/net/arm/ep93xx_eth.c | |
parent | 889bd9b6dbcd426b8698c4a779dd7dbf247f57b8 (diff) |
net: Remove unused netdev arg from some NAPI interfaces.
When the napi api was changed to separate its 1:1 binding to the net_device
struct, the netif_rx_[prep|schedule|complete] api failed to remove the now
vestigual net_device structure parameter. This patch cleans up that api by
properly removing it..
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/arm/ep93xx_eth.c')
-rw-r--r-- | drivers/net/arm/ep93xx_eth.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/arm/ep93xx_eth.c b/drivers/net/arm/ep93xx_eth.c index 588c9739d13d..6ecc600c1bcc 100644 --- a/drivers/net/arm/ep93xx_eth.c +++ b/drivers/net/arm/ep93xx_eth.c | |||
@@ -298,7 +298,7 @@ poll_some_more: | |||
298 | int more = 0; | 298 | int more = 0; |
299 | 299 | ||
300 | spin_lock_irq(&ep->rx_lock); | 300 | spin_lock_irq(&ep->rx_lock); |
301 | __netif_rx_complete(dev, napi); | 301 | __netif_rx_complete(napi); |
302 | wrl(ep, REG_INTEN, REG_INTEN_TX | REG_INTEN_RX); | 302 | wrl(ep, REG_INTEN, REG_INTEN_TX | REG_INTEN_RX); |
303 | if (ep93xx_have_more_rx(ep)) { | 303 | if (ep93xx_have_more_rx(ep)) { |
304 | wrl(ep, REG_INTEN, REG_INTEN_TX); | 304 | wrl(ep, REG_INTEN, REG_INTEN_TX); |
@@ -415,9 +415,9 @@ static irqreturn_t ep93xx_irq(int irq, void *dev_id) | |||
415 | 415 | ||
416 | if (status & REG_INTSTS_RX) { | 416 | if (status & REG_INTSTS_RX) { |
417 | spin_lock(&ep->rx_lock); | 417 | spin_lock(&ep->rx_lock); |
418 | if (likely(netif_rx_schedule_prep(dev, &ep->napi))) { | 418 | if (likely(netif_rx_schedule_prep(&ep->napi))) { |
419 | wrl(ep, REG_INTEN, REG_INTEN_TX); | 419 | wrl(ep, REG_INTEN, REG_INTEN_TX); |
420 | __netif_rx_schedule(dev, &ep->napi); | 420 | __netif_rx_schedule(&ep->napi); |
421 | } | 421 | } |
422 | spin_unlock(&ep->rx_lock); | 422 | spin_unlock(&ep->rx_lock); |
423 | } | 423 | } |