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/cs89x0.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/cs89x0.c')
-rw-r--r-- | drivers/net/cs89x0.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c index e4d50f0de930..4ffc9b44a8e1 100644 --- a/drivers/net/cs89x0.c +++ b/drivers/net/cs89x0.c | |||
@@ -249,7 +249,7 @@ struct net_local { | |||
249 | static int cs89x0_probe1(struct net_device *dev, int ioaddr, int modular); | 249 | static int cs89x0_probe1(struct net_device *dev, int ioaddr, int modular); |
250 | static int net_open(struct net_device *dev); | 250 | static int net_open(struct net_device *dev); |
251 | static int net_send_packet(struct sk_buff *skb, struct net_device *dev); | 251 | static int net_send_packet(struct sk_buff *skb, struct net_device *dev); |
252 | static irqreturn_t net_interrupt(int irq, void *dev_id, struct pt_regs *regs); | 252 | static irqreturn_t net_interrupt(int irq, void *dev_id); |
253 | static void set_multicast_list(struct net_device *dev); | 253 | static void set_multicast_list(struct net_device *dev); |
254 | static void net_timeout(struct net_device *dev); | 254 | static void net_timeout(struct net_device *dev); |
255 | static void net_rx(struct net_device *dev); | 255 | static void net_rx(struct net_device *dev); |
@@ -495,7 +495,7 @@ get_eeprom_cksum(int off, int len, int *buffer) | |||
495 | static void net_poll_controller(struct net_device *dev) | 495 | static void net_poll_controller(struct net_device *dev) |
496 | { | 496 | { |
497 | disable_irq(dev->irq); | 497 | disable_irq(dev->irq); |
498 | net_interrupt(dev->irq, dev, NULL); | 498 | net_interrupt(dev->irq, dev); |
499 | enable_irq(dev->irq); | 499 | enable_irq(dev->irq); |
500 | } | 500 | } |
501 | #endif | 501 | #endif |
@@ -1573,7 +1573,7 @@ static int net_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
1573 | /* The typical workload of the driver: | 1573 | /* The typical workload of the driver: |
1574 | Handle the network interface interrupts. */ | 1574 | Handle the network interface interrupts. */ |
1575 | 1575 | ||
1576 | static irqreturn_t net_interrupt(int irq, void *dev_id, struct pt_regs * regs) | 1576 | static irqreturn_t net_interrupt(int irq, void *dev_id) |
1577 | { | 1577 | { |
1578 | struct net_device *dev = dev_id; | 1578 | struct net_device *dev = dev_id; |
1579 | struct net_local *lp; | 1579 | struct net_local *lp; |