diff options
Diffstat (limited to 'drivers/net/8139too.c')
-rw-r--r-- | drivers/net/8139too.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c index dbc5c0b1b96c..d02ed51abfcc 100644 --- a/drivers/net/8139too.c +++ b/drivers/net/8139too.c | |||
@@ -629,8 +629,7 @@ static int rtl8139_poll(struct net_device *dev, int *budget); | |||
629 | #ifdef CONFIG_NET_POLL_CONTROLLER | 629 | #ifdef CONFIG_NET_POLL_CONTROLLER |
630 | static void rtl8139_poll_controller(struct net_device *dev); | 630 | static void rtl8139_poll_controller(struct net_device *dev); |
631 | #endif | 631 | #endif |
632 | static irqreturn_t rtl8139_interrupt (int irq, void *dev_instance, | 632 | static irqreturn_t rtl8139_interrupt (int irq, void *dev_instance); |
633 | struct pt_regs *regs); | ||
634 | static int rtl8139_close (struct net_device *dev); | 633 | static int rtl8139_close (struct net_device *dev); |
635 | static int netdev_ioctl (struct net_device *dev, struct ifreq *rq, int cmd); | 634 | static int netdev_ioctl (struct net_device *dev, struct ifreq *rq, int cmd); |
636 | static struct net_device_stats *rtl8139_get_stats (struct net_device *dev); | 635 | static struct net_device_stats *rtl8139_get_stats (struct net_device *dev); |
@@ -2146,8 +2145,7 @@ static int rtl8139_poll(struct net_device *dev, int *budget) | |||
2146 | 2145 | ||
2147 | /* The interrupt handler does all of the Rx thread work and cleans up | 2146 | /* The interrupt handler does all of the Rx thread work and cleans up |
2148 | after the Tx thread. */ | 2147 | after the Tx thread. */ |
2149 | static irqreturn_t rtl8139_interrupt (int irq, void *dev_instance, | 2148 | static irqreturn_t rtl8139_interrupt (int irq, void *dev_instance) |
2150 | struct pt_regs *regs) | ||
2151 | { | 2149 | { |
2152 | struct net_device *dev = (struct net_device *) dev_instance; | 2150 | struct net_device *dev = (struct net_device *) dev_instance; |
2153 | struct rtl8139_private *tp = netdev_priv(dev); | 2151 | struct rtl8139_private *tp = netdev_priv(dev); |
@@ -2219,7 +2217,7 @@ static irqreturn_t rtl8139_interrupt (int irq, void *dev_instance, | |||
2219 | static void rtl8139_poll_controller(struct net_device *dev) | 2217 | static void rtl8139_poll_controller(struct net_device *dev) |
2220 | { | 2218 | { |
2221 | disable_irq(dev->irq); | 2219 | disable_irq(dev->irq); |
2222 | rtl8139_interrupt(dev->irq, dev, NULL); | 2220 | rtl8139_interrupt(dev->irq, dev); |
2223 | enable_irq(dev->irq); | 2221 | enable_irq(dev->irq); |
2224 | } | 2222 | } |
2225 | #endif | 2223 | #endif |