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/amd8111e.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/amd8111e.c')
-rw-r--r-- | drivers/net/amd8111e.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c index 0bc4f54d5db9..187ac6eb6e94 100644 --- a/drivers/net/amd8111e.c +++ b/drivers/net/amd8111e.c | |||
@@ -831,7 +831,7 @@ static int amd8111e_rx_poll(struct napi_struct *napi, int budget) | |||
831 | if (rx_pkt_limit > 0) { | 831 | if (rx_pkt_limit > 0) { |
832 | /* Receive descriptor is empty now */ | 832 | /* Receive descriptor is empty now */ |
833 | spin_lock_irqsave(&lp->lock, flags); | 833 | spin_lock_irqsave(&lp->lock, flags); |
834 | __netif_rx_complete(dev, napi); | 834 | __netif_rx_complete(napi); |
835 | writel(VAL0|RINTEN0, mmio + INTEN0); | 835 | writel(VAL0|RINTEN0, mmio + INTEN0); |
836 | writel(VAL2 | RDMD0, mmio + CMD0); | 836 | writel(VAL2 | RDMD0, mmio + CMD0); |
837 | spin_unlock_irqrestore(&lp->lock, flags); | 837 | spin_unlock_irqrestore(&lp->lock, flags); |
@@ -1170,11 +1170,11 @@ static irqreturn_t amd8111e_interrupt(int irq, void *dev_id) | |||
1170 | 1170 | ||
1171 | /* Check if Receive Interrupt has occurred. */ | 1171 | /* Check if Receive Interrupt has occurred. */ |
1172 | if (intr0 & RINT0) { | 1172 | if (intr0 & RINT0) { |
1173 | if (netif_rx_schedule_prep(dev, &lp->napi)) { | 1173 | if (netif_rx_schedule_prep(&lp->napi)) { |
1174 | /* Disable receive interupts */ | 1174 | /* Disable receive interupts */ |
1175 | writel(RINTEN0, mmio + INTEN0); | 1175 | writel(RINTEN0, mmio + INTEN0); |
1176 | /* Schedule a polling routine */ | 1176 | /* Schedule a polling routine */ |
1177 | __netif_rx_schedule(dev, &lp->napi); | 1177 | __netif_rx_schedule(&lp->napi); |
1178 | } else if (intren0 & RINTEN0) { | 1178 | } else if (intren0 & RINTEN0) { |
1179 | printk("************Driver bug! \ | 1179 | printk("************Driver bug! \ |
1180 | interrupt while in poll\n"); | 1180 | interrupt while in poll\n"); |