diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
commit | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (patch) | |
tree | 93824f573767da634fbc82c388b6d33cc454212b /drivers/net/spider_net.c | |
parent | c1a26e7d40fb814716950122353a1a556844286b (diff) | |
parent | 7d12e780e003f93433d49ce78cfedf4b4c52adc5 (diff) |
Merge git://git.infradead.org/~dhowells/irq-2.6
* git://git.infradead.org/~dhowells/irq-2.6:
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
IRQ: Typedef the IRQ handler function type
IRQ: Typedef the IRQ flow handler function type
Diffstat (limited to 'drivers/net/spider_net.c')
-rw-r--r-- | drivers/net/spider_net.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c index 1397fc55cf68..46a009085f7c 100644 --- a/drivers/net/spider_net.c +++ b/drivers/net/spider_net.c | |||
@@ -1445,7 +1445,7 @@ spider_net_handle_error_irq(struct spider_net_card *card, u32 status_reg) | |||
1445 | * interrupts for this device and makes the stack poll the driver | 1445 | * interrupts for this device and makes the stack poll the driver |
1446 | */ | 1446 | */ |
1447 | static irqreturn_t | 1447 | static irqreturn_t |
1448 | spider_net_interrupt(int irq, void *ptr, struct pt_regs *regs) | 1448 | spider_net_interrupt(int irq, void *ptr) |
1449 | { | 1449 | { |
1450 | struct net_device *netdev = ptr; | 1450 | struct net_device *netdev = ptr; |
1451 | struct spider_net_card *card = netdev_priv(netdev); | 1451 | struct spider_net_card *card = netdev_priv(netdev); |
@@ -1481,7 +1481,7 @@ static void | |||
1481 | spider_net_poll_controller(struct net_device *netdev) | 1481 | spider_net_poll_controller(struct net_device *netdev) |
1482 | { | 1482 | { |
1483 | disable_irq(netdev->irq); | 1483 | disable_irq(netdev->irq); |
1484 | spider_net_interrupt(netdev->irq, netdev, NULL); | 1484 | spider_net_interrupt(netdev->irq, netdev); |
1485 | enable_irq(netdev->irq); | 1485 | enable_irq(netdev->irq); |
1486 | } | 1486 | } |
1487 | #endif /* CONFIG_NET_POLL_CONTROLLER */ | 1487 | #endif /* CONFIG_NET_POLL_CONTROLLER */ |