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/typhoon.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/typhoon.c')
-rw-r--r-- | drivers/net/typhoon.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c index 5386d9b73e6a..0009f4e34433 100644 --- a/drivers/net/typhoon.c +++ b/drivers/net/typhoon.c | |||
@@ -1755,7 +1755,6 @@ static int | |||
1755 | typhoon_poll(struct napi_struct *napi, int budget) | 1755 | typhoon_poll(struct napi_struct *napi, int budget) |
1756 | { | 1756 | { |
1757 | struct typhoon *tp = container_of(napi, struct typhoon, napi); | 1757 | struct typhoon *tp = container_of(napi, struct typhoon, napi); |
1758 | struct net_device *dev = tp->dev; | ||
1759 | struct typhoon_indexes *indexes = tp->indexes; | 1758 | struct typhoon_indexes *indexes = tp->indexes; |
1760 | int work_done; | 1759 | int work_done; |
1761 | 1760 | ||
@@ -1784,7 +1783,7 @@ typhoon_poll(struct napi_struct *napi, int budget) | |||
1784 | } | 1783 | } |
1785 | 1784 | ||
1786 | if (work_done < budget) { | 1785 | if (work_done < budget) { |
1787 | netif_rx_complete(dev, napi); | 1786 | netif_rx_complete(napi); |
1788 | iowrite32(TYPHOON_INTR_NONE, | 1787 | iowrite32(TYPHOON_INTR_NONE, |
1789 | tp->ioaddr + TYPHOON_REG_INTR_MASK); | 1788 | tp->ioaddr + TYPHOON_REG_INTR_MASK); |
1790 | typhoon_post_pci_writes(tp->ioaddr); | 1789 | typhoon_post_pci_writes(tp->ioaddr); |
@@ -1807,10 +1806,10 @@ typhoon_interrupt(int irq, void *dev_instance) | |||
1807 | 1806 | ||
1808 | iowrite32(intr_status, ioaddr + TYPHOON_REG_INTR_STATUS); | 1807 | iowrite32(intr_status, ioaddr + TYPHOON_REG_INTR_STATUS); |
1809 | 1808 | ||
1810 | if (netif_rx_schedule_prep(dev, &tp->napi)) { | 1809 | if (netif_rx_schedule_prep(&tp->napi)) { |
1811 | iowrite32(TYPHOON_INTR_ALL, ioaddr + TYPHOON_REG_INTR_MASK); | 1810 | iowrite32(TYPHOON_INTR_ALL, ioaddr + TYPHOON_REG_INTR_MASK); |
1812 | typhoon_post_pci_writes(ioaddr); | 1811 | typhoon_post_pci_writes(ioaddr); |
1813 | __netif_rx_schedule(dev, &tp->napi); | 1812 | __netif_rx_schedule(&tp->napi); |
1814 | } else { | 1813 | } else { |
1815 | printk(KERN_ERR "%s: Error, poll already scheduled\n", | 1814 | printk(KERN_ERR "%s: Error, poll already scheduled\n", |
1816 | dev->name); | 1815 | dev->name); |