diff options
Diffstat (limited to 'drivers/net/r8169.c')
-rw-r--r-- | drivers/net/r8169.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 4c47c5b10ba0..f1c75751cab7 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c | |||
@@ -473,8 +473,7 @@ MODULE_VERSION(RTL8169_VERSION); | |||
473 | 473 | ||
474 | static int rtl8169_open(struct net_device *dev); | 474 | static int rtl8169_open(struct net_device *dev); |
475 | static int rtl8169_start_xmit(struct sk_buff *skb, struct net_device *dev); | 475 | static int rtl8169_start_xmit(struct sk_buff *skb, struct net_device *dev); |
476 | static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance, | 476 | static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance); |
477 | struct pt_regs *regs); | ||
478 | static int rtl8169_init_ring(struct net_device *dev); | 477 | static int rtl8169_init_ring(struct net_device *dev); |
479 | static void rtl8169_hw_start(struct net_device *dev); | 478 | static void rtl8169_hw_start(struct net_device *dev); |
480 | static int rtl8169_close(struct net_device *dev); | 479 | static int rtl8169_close(struct net_device *dev); |
@@ -1392,7 +1391,7 @@ static void rtl8169_netpoll(struct net_device *dev) | |||
1392 | struct pci_dev *pdev = tp->pci_dev; | 1391 | struct pci_dev *pdev = tp->pci_dev; |
1393 | 1392 | ||
1394 | disable_irq(pdev->irq); | 1393 | disable_irq(pdev->irq); |
1395 | rtl8169_interrupt(pdev->irq, dev, NULL); | 1394 | rtl8169_interrupt(pdev->irq, dev); |
1396 | enable_irq(pdev->irq); | 1395 | enable_irq(pdev->irq); |
1397 | } | 1396 | } |
1398 | #endif | 1397 | #endif |
@@ -2592,7 +2591,7 @@ rtl8169_rx_interrupt(struct net_device *dev, struct rtl8169_private *tp, | |||
2592 | 2591 | ||
2593 | /* The interrupt handler does all of the Rx thread work and cleans up after the Tx thread. */ | 2592 | /* The interrupt handler does all of the Rx thread work and cleans up after the Tx thread. */ |
2594 | static irqreturn_t | 2593 | static irqreturn_t |
2595 | rtl8169_interrupt(int irq, void *dev_instance, struct pt_regs *regs) | 2594 | rtl8169_interrupt(int irq, void *dev_instance) |
2596 | { | 2595 | { |
2597 | struct net_device *dev = (struct net_device *) dev_instance; | 2596 | struct net_device *dev = (struct net_device *) dev_instance; |
2598 | struct rtl8169_private *tp = netdev_priv(dev); | 2597 | struct rtl8169_private *tp = netdev_priv(dev); |