diff options
Diffstat (limited to 'drivers/net/cassini.c')
-rw-r--r-- | drivers/net/cassini.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c index 7694365092f8..521c5b71023c 100644 --- a/drivers/net/cassini.c +++ b/drivers/net/cassini.c | |||
@@ -2469,7 +2469,7 @@ static inline void cas_handle_irqN(struct net_device *dev, | |||
2469 | cas_post_rxcs_ringN(dev, cp, ring); | 2469 | cas_post_rxcs_ringN(dev, cp, ring); |
2470 | } | 2470 | } |
2471 | 2471 | ||
2472 | static irqreturn_t cas_interruptN(int irq, void *dev_id, struct pt_regs *regs) | 2472 | static irqreturn_t cas_interruptN(int irq, void *dev_id) |
2473 | { | 2473 | { |
2474 | struct net_device *dev = dev_id; | 2474 | struct net_device *dev = dev_id; |
2475 | struct cas *cp = netdev_priv(dev); | 2475 | struct cas *cp = netdev_priv(dev); |
@@ -2522,7 +2522,7 @@ static inline void cas_handle_irq1(struct cas *cp, const u32 status) | |||
2522 | } | 2522 | } |
2523 | 2523 | ||
2524 | /* ring 2 handles a few more events than 3 and 4 */ | 2524 | /* ring 2 handles a few more events than 3 and 4 */ |
2525 | static irqreturn_t cas_interrupt1(int irq, void *dev_id, struct pt_regs *regs) | 2525 | static irqreturn_t cas_interrupt1(int irq, void *dev_id) |
2526 | { | 2526 | { |
2527 | struct net_device *dev = dev_id; | 2527 | struct net_device *dev = dev_id; |
2528 | struct cas *cp = netdev_priv(dev); | 2528 | struct cas *cp = netdev_priv(dev); |
@@ -2574,7 +2574,7 @@ static inline void cas_handle_irq(struct net_device *dev, | |||
2574 | cas_post_rxcs_ringN(dev, cp, 0); | 2574 | cas_post_rxcs_ringN(dev, cp, 0); |
2575 | } | 2575 | } |
2576 | 2576 | ||
2577 | static irqreturn_t cas_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 2577 | static irqreturn_t cas_interrupt(int irq, void *dev_id) |
2578 | { | 2578 | { |
2579 | struct net_device *dev = dev_id; | 2579 | struct net_device *dev = dev_id; |
2580 | struct cas *cp = netdev_priv(dev); | 2580 | struct cas *cp = netdev_priv(dev); |
@@ -2689,7 +2689,7 @@ static void cas_netpoll(struct net_device *dev) | |||
2689 | struct cas *cp = netdev_priv(dev); | 2689 | struct cas *cp = netdev_priv(dev); |
2690 | 2690 | ||
2691 | cas_disable_irq(cp, 0); | 2691 | cas_disable_irq(cp, 0); |
2692 | cas_interrupt(cp->pdev->irq, dev, NULL); | 2692 | cas_interrupt(cp->pdev->irq, dev); |
2693 | cas_enable_irq(cp, 0); | 2693 | cas_enable_irq(cp, 0); |
2694 | 2694 | ||
2695 | #ifdef USE_PCI_INTB | 2695 | #ifdef USE_PCI_INTB |