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/tulip | |
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/tulip')
-rw-r--r-- | drivers/net/tulip/interrupt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/tulip/interrupt.c b/drivers/net/tulip/interrupt.c index 739d610d18c5..6c3428a37c0b 100644 --- a/drivers/net/tulip/interrupt.c +++ b/drivers/net/tulip/interrupt.c | |||
@@ -103,7 +103,7 @@ void oom_timer(unsigned long data) | |||
103 | { | 103 | { |
104 | struct net_device *dev = (struct net_device *)data; | 104 | struct net_device *dev = (struct net_device *)data; |
105 | struct tulip_private *tp = netdev_priv(dev); | 105 | struct tulip_private *tp = netdev_priv(dev); |
106 | netif_rx_schedule(dev, &tp->napi); | 106 | netif_rx_schedule(&tp->napi); |
107 | } | 107 | } |
108 | 108 | ||
109 | int tulip_poll(struct napi_struct *napi, int budget) | 109 | int tulip_poll(struct napi_struct *napi, int budget) |
@@ -300,7 +300,7 @@ int tulip_poll(struct napi_struct *napi, int budget) | |||
300 | 300 | ||
301 | /* Remove us from polling list and enable RX intr. */ | 301 | /* Remove us from polling list and enable RX intr. */ |
302 | 302 | ||
303 | netif_rx_complete(dev, napi); | 303 | netif_rx_complete(napi); |
304 | iowrite32(tulip_tbl[tp->chip_id].valid_intrs, tp->base_addr+CSR7); | 304 | iowrite32(tulip_tbl[tp->chip_id].valid_intrs, tp->base_addr+CSR7); |
305 | 305 | ||
306 | /* The last op happens after poll completion. Which means the following: | 306 | /* The last op happens after poll completion. Which means the following: |
@@ -336,7 +336,7 @@ int tulip_poll(struct napi_struct *napi, int budget) | |||
336 | * before we did netif_rx_complete(). See? We would lose it. */ | 336 | * before we did netif_rx_complete(). See? We would lose it. */ |
337 | 337 | ||
338 | /* remove ourselves from the polling list */ | 338 | /* remove ourselves from the polling list */ |
339 | netif_rx_complete(dev, napi); | 339 | netif_rx_complete(napi); |
340 | 340 | ||
341 | return work_done; | 341 | return work_done; |
342 | } | 342 | } |
@@ -519,7 +519,7 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance) | |||
519 | rxd++; | 519 | rxd++; |
520 | /* Mask RX intrs and add the device to poll list. */ | 520 | /* Mask RX intrs and add the device to poll list. */ |
521 | iowrite32(tulip_tbl[tp->chip_id].valid_intrs&~RxPollInt, ioaddr + CSR7); | 521 | iowrite32(tulip_tbl[tp->chip_id].valid_intrs&~RxPollInt, ioaddr + CSR7); |
522 | netif_rx_schedule(dev, &tp->napi); | 522 | netif_rx_schedule(&tp->napi); |
523 | 523 | ||
524 | if (!(csr5&~(AbnormalIntr|NormalIntr|RxPollInt|TPLnkPass))) | 524 | if (!(csr5&~(AbnormalIntr|NormalIntr|RxPollInt|TPLnkPass))) |
525 | break; | 525 | break; |