From aea6539a8d39e63e4119f4cbf8996364c0ce39c6 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Mon, 3 Jul 2006 00:25:37 -0700 Subject: [PATCH] --- yaml --- r: 31848 b: refs/heads/master c: 479ceddd7baf3b387665c4d69a7398918b201ad0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/forcedeth.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f92ff5dc9fe7..340bd10825fa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd11acdd8542cb0c0fa7cd86590b1ba79d7e263a +refs/heads/master: 479ceddd7baf3b387665c4d69a7398918b201ad0 diff --git a/trunk/drivers/net/forcedeth.c b/trunk/drivers/net/forcedeth.c index 3c90003f4230..92740c66635d 100644 --- a/trunk/drivers/net/forcedeth.c +++ b/trunk/drivers/net/forcedeth.c @@ -2761,22 +2761,22 @@ static void nv_do_nic_poll(unsigned long data) pci_push(base); if (!using_multi_irqs(dev)) { - nv_nic_irq((int) 0, (void *) data, (struct pt_regs *) NULL); + nv_nic_irq(0, dev, NULL); if (np->msi_flags & NV_MSI_X_ENABLED) enable_irq(np->msi_x_entry[NV_MSI_X_VECTOR_ALL].vector); else enable_irq(dev->irq); } else { if (np->nic_poll_irq & NVREG_IRQ_RX_ALL) { - nv_nic_irq_rx((int) 0, (void *) data, (struct pt_regs *) NULL); + nv_nic_irq_rx(0, dev, NULL); enable_irq(np->msi_x_entry[NV_MSI_X_VECTOR_RX].vector); } if (np->nic_poll_irq & NVREG_IRQ_TX_ALL) { - nv_nic_irq_tx((int) 0, (void *) data, (struct pt_regs *) NULL); + nv_nic_irq_tx(0, dev, NULL); enable_irq(np->msi_x_entry[NV_MSI_X_VECTOR_TX].vector); } if (np->nic_poll_irq & NVREG_IRQ_OTHER) { - nv_nic_irq_other((int) 0, (void *) data, (struct pt_regs *) NULL); + nv_nic_irq_other(0, dev, NULL); enable_irq(np->msi_x_entry[NV_MSI_X_VECTOR_OTHER].vector); } }