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/tg3.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/tg3.c')
-rw-r--r-- | drivers/net/tg3.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 7971d802508d..04ae1e86aeaa 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
@@ -4451,7 +4451,7 @@ static int tg3_poll(struct napi_struct *napi, int budget) | |||
4451 | sblk->status &= ~SD_STATUS_UPDATED; | 4451 | sblk->status &= ~SD_STATUS_UPDATED; |
4452 | 4452 | ||
4453 | if (likely(!tg3_has_work(tp))) { | 4453 | if (likely(!tg3_has_work(tp))) { |
4454 | netif_rx_complete(tp->dev, napi); | 4454 | netif_rx_complete(napi); |
4455 | tg3_restart_ints(tp); | 4455 | tg3_restart_ints(tp); |
4456 | break; | 4456 | break; |
4457 | } | 4457 | } |
@@ -4461,7 +4461,7 @@ static int tg3_poll(struct napi_struct *napi, int budget) | |||
4461 | 4461 | ||
4462 | tx_recovery: | 4462 | tx_recovery: |
4463 | /* work_done is guaranteed to be less than budget. */ | 4463 | /* work_done is guaranteed to be less than budget. */ |
4464 | netif_rx_complete(tp->dev, napi); | 4464 | netif_rx_complete(napi); |
4465 | schedule_work(&tp->reset_task); | 4465 | schedule_work(&tp->reset_task); |
4466 | return work_done; | 4466 | return work_done; |
4467 | } | 4467 | } |
@@ -4510,7 +4510,7 @@ static irqreturn_t tg3_msi_1shot(int irq, void *dev_id) | |||
4510 | prefetch(&tp->rx_rcb[tp->rx_rcb_ptr]); | 4510 | prefetch(&tp->rx_rcb[tp->rx_rcb_ptr]); |
4511 | 4511 | ||
4512 | if (likely(!tg3_irq_sync(tp))) | 4512 | if (likely(!tg3_irq_sync(tp))) |
4513 | netif_rx_schedule(dev, &tp->napi); | 4513 | netif_rx_schedule(&tp->napi); |
4514 | 4514 | ||
4515 | return IRQ_HANDLED; | 4515 | return IRQ_HANDLED; |
4516 | } | 4516 | } |
@@ -4535,7 +4535,7 @@ static irqreturn_t tg3_msi(int irq, void *dev_id) | |||
4535 | */ | 4535 | */ |
4536 | tw32_mailbox(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW, 0x00000001); | 4536 | tw32_mailbox(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW, 0x00000001); |
4537 | if (likely(!tg3_irq_sync(tp))) | 4537 | if (likely(!tg3_irq_sync(tp))) |
4538 | netif_rx_schedule(dev, &tp->napi); | 4538 | netif_rx_schedule(&tp->napi); |
4539 | 4539 | ||
4540 | return IRQ_RETVAL(1); | 4540 | return IRQ_RETVAL(1); |
4541 | } | 4541 | } |
@@ -4577,7 +4577,7 @@ static irqreturn_t tg3_interrupt(int irq, void *dev_id) | |||
4577 | sblk->status &= ~SD_STATUS_UPDATED; | 4577 | sblk->status &= ~SD_STATUS_UPDATED; |
4578 | if (likely(tg3_has_work(tp))) { | 4578 | if (likely(tg3_has_work(tp))) { |
4579 | prefetch(&tp->rx_rcb[tp->rx_rcb_ptr]); | 4579 | prefetch(&tp->rx_rcb[tp->rx_rcb_ptr]); |
4580 | netif_rx_schedule(dev, &tp->napi); | 4580 | netif_rx_schedule(&tp->napi); |
4581 | } else { | 4581 | } else { |
4582 | /* No work, shared interrupt perhaps? re-enable | 4582 | /* No work, shared interrupt perhaps? re-enable |
4583 | * interrupts, and flush that PCI write | 4583 | * interrupts, and flush that PCI write |
@@ -4623,7 +4623,7 @@ static irqreturn_t tg3_interrupt_tagged(int irq, void *dev_id) | |||
4623 | tw32_mailbox_f(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW, 0x00000001); | 4623 | tw32_mailbox_f(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW, 0x00000001); |
4624 | if (tg3_irq_sync(tp)) | 4624 | if (tg3_irq_sync(tp)) |
4625 | goto out; | 4625 | goto out; |
4626 | if (netif_rx_schedule_prep(dev, &tp->napi)) { | 4626 | if (netif_rx_schedule_prep(&tp->napi)) { |
4627 | prefetch(&tp->rx_rcb[tp->rx_rcb_ptr]); | 4627 | prefetch(&tp->rx_rcb[tp->rx_rcb_ptr]); |
4628 | /* Update last_tag to mark that this status has been | 4628 | /* Update last_tag to mark that this status has been |
4629 | * seen. Because interrupt may be shared, we may be | 4629 | * seen. Because interrupt may be shared, we may be |
@@ -4631,7 +4631,7 @@ static irqreturn_t tg3_interrupt_tagged(int irq, void *dev_id) | |||
4631 | * if tg3_poll() is not scheduled. | 4631 | * if tg3_poll() is not scheduled. |
4632 | */ | 4632 | */ |
4633 | tp->last_tag = sblk->status_tag; | 4633 | tp->last_tag = sblk->status_tag; |
4634 | __netif_rx_schedule(dev, &tp->napi); | 4634 | __netif_rx_schedule(&tp->napi); |
4635 | } | 4635 | } |
4636 | out: | 4636 | out: |
4637 | return IRQ_RETVAL(handled); | 4637 | return IRQ_RETVAL(handled); |