diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/arm/am79c961a.c | 2 | ||||
-rw-r--r-- | drivers/net/ixp2000/ixpdev.c | 2 | ||||
-rw-r--r-- | drivers/net/sb1250-mac.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/arm/am79c961a.c b/drivers/net/arm/am79c961a.c index 8f0d7ce503c9..2143eeb7a2b0 100644 --- a/drivers/net/arm/am79c961a.c +++ b/drivers/net/arm/am79c961a.c | |||
@@ -634,7 +634,7 @@ static void am79c961_poll_controller(struct net_device *dev) | |||
634 | { | 634 | { |
635 | unsigned long flags; | 635 | unsigned long flags; |
636 | local_irq_save(flags); | 636 | local_irq_save(flags); |
637 | am79c961_interrupt(dev->irq, dev, NULL); | 637 | am79c961_interrupt(dev->irq, dev); |
638 | local_irq_restore(flags); | 638 | local_irq_restore(flags); |
639 | } | 639 | } |
640 | #endif | 640 | #endif |
diff --git a/drivers/net/ixp2000/ixpdev.c b/drivers/net/ixp2000/ixpdev.c index 6683afc02aaa..d5f694fc4a21 100644 --- a/drivers/net/ixp2000/ixpdev.c +++ b/drivers/net/ixp2000/ixpdev.c | |||
@@ -222,7 +222,7 @@ static irqreturn_t ixpdev_interrupt(int irq, void *dev_id) | |||
222 | static void ixpdev_poll_controller(struct net_device *dev) | 222 | static void ixpdev_poll_controller(struct net_device *dev) |
223 | { | 223 | { |
224 | disable_irq(IRQ_IXP2000_THDA0); | 224 | disable_irq(IRQ_IXP2000_THDA0); |
225 | ixpdev_interrupt(IRQ_IXP2000_THDA0, dev, NULL); | 225 | ixpdev_interrupt(IRQ_IXP2000_THDA0, dev); |
226 | enable_irq(IRQ_IXP2000_THDA0); | 226 | enable_irq(IRQ_IXP2000_THDA0); |
227 | } | 227 | } |
228 | #endif | 228 | #endif |
diff --git a/drivers/net/sb1250-mac.c b/drivers/net/sb1250-mac.c index 132e2148b21c..e7fdcf15b5a7 100644 --- a/drivers/net/sb1250-mac.c +++ b/drivers/net/sb1250-mac.c | |||
@@ -1159,7 +1159,7 @@ static void sbmac_netpoll(struct net_device *netdev) | |||
1159 | 1159 | ||
1160 | __raw_writeq(0, sc->sbm_imr); | 1160 | __raw_writeq(0, sc->sbm_imr); |
1161 | 1161 | ||
1162 | sbmac_intr(irq, netdev, NULL); | 1162 | sbmac_intr(irq, netdev); |
1163 | 1163 | ||
1164 | #ifdef CONFIG_SBMAC_COALESCE | 1164 | #ifdef CONFIG_SBMAC_COALESCE |
1165 | __raw_writeq(((M_MAC_INT_EOP_COUNT | M_MAC_INT_EOP_TIMER) << S_MAC_TX_CH0) | | 1165 | __raw_writeq(((M_MAC_INT_EOP_COUNT | M_MAC_INT_EOP_TIMER) << S_MAC_TX_CH0) | |