diff options
Diffstat (limited to 'drivers/net/pcmcia/axnet_cs.c')
-rw-r--r-- | drivers/net/pcmcia/axnet_cs.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c index a8891a9000ac..e5f366910914 100644 --- a/drivers/net/pcmcia/axnet_cs.c +++ b/drivers/net/pcmcia/axnet_cs.c | |||
@@ -92,7 +92,7 @@ static int axnet_open(struct net_device *dev); | |||
92 | static int axnet_close(struct net_device *dev); | 92 | static int axnet_close(struct net_device *dev); |
93 | static int axnet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); | 93 | static int axnet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); |
94 | static const struct ethtool_ops netdev_ethtool_ops; | 94 | static const struct ethtool_ops netdev_ethtool_ops; |
95 | static irqreturn_t ei_irq_wrapper(int irq, void *dev_id, struct pt_regs *regs); | 95 | static irqreturn_t ei_irq_wrapper(int irq, void *dev_id); |
96 | static void ei_watchdog(u_long arg); | 96 | static void ei_watchdog(u_long arg); |
97 | static void axnet_reset_8390(struct net_device *dev); | 97 | static void axnet_reset_8390(struct net_device *dev); |
98 | 98 | ||
@@ -112,7 +112,7 @@ static void axdev_setup(struct net_device *dev); | |||
112 | static void AX88190_init(struct net_device *dev, int startp); | 112 | static void AX88190_init(struct net_device *dev, int startp); |
113 | static int ax_open(struct net_device *dev); | 113 | static int ax_open(struct net_device *dev); |
114 | static int ax_close(struct net_device *dev); | 114 | static int ax_close(struct net_device *dev); |
115 | static irqreturn_t ax_interrupt(int irq, void *dev_id, struct pt_regs *regs); | 115 | static irqreturn_t ax_interrupt(int irq, void *dev_id); |
116 | 116 | ||
117 | /*====================================================================*/ | 117 | /*====================================================================*/ |
118 | 118 | ||
@@ -599,11 +599,11 @@ static void axnet_reset_8390(struct net_device *dev) | |||
599 | 599 | ||
600 | /*====================================================================*/ | 600 | /*====================================================================*/ |
601 | 601 | ||
602 | static irqreturn_t ei_irq_wrapper(int irq, void *dev_id, struct pt_regs *regs) | 602 | static irqreturn_t ei_irq_wrapper(int irq, void *dev_id) |
603 | { | 603 | { |
604 | struct net_device *dev = dev_id; | 604 | struct net_device *dev = dev_id; |
605 | PRIV(dev)->stale = 0; | 605 | PRIV(dev)->stale = 0; |
606 | return ax_interrupt(irq, dev_id, regs); | 606 | return ax_interrupt(irq, dev_id); |
607 | } | 607 | } |
608 | 608 | ||
609 | static void ei_watchdog(u_long arg) | 609 | static void ei_watchdog(u_long arg) |
@@ -621,7 +621,7 @@ static void ei_watchdog(u_long arg) | |||
621 | if (info->stale++ && (inb_p(nic_base + EN0_ISR) & ENISR_ALL)) { | 621 | if (info->stale++ && (inb_p(nic_base + EN0_ISR) & ENISR_ALL)) { |
622 | if (!info->fast_poll) | 622 | if (!info->fast_poll) |
623 | printk(KERN_INFO "%s: interrupt(s) dropped!\n", dev->name); | 623 | printk(KERN_INFO "%s: interrupt(s) dropped!\n", dev->name); |
624 | ei_irq_wrapper(dev->irq, dev, NULL); | 624 | ei_irq_wrapper(dev->irq, dev); |
625 | info->fast_poll = HZ; | 625 | info->fast_poll = HZ; |
626 | } | 626 | } |
627 | if (info->fast_poll) { | 627 | if (info->fast_poll) { |
@@ -1193,7 +1193,7 @@ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1193 | * needed. | 1193 | * needed. |
1194 | */ | 1194 | */ |
1195 | 1195 | ||
1196 | static irqreturn_t ax_interrupt(int irq, void *dev_id, struct pt_regs * regs) | 1196 | static irqreturn_t ax_interrupt(int irq, void *dev_id) |
1197 | { | 1197 | { |
1198 | struct net_device *dev = dev_id; | 1198 | struct net_device *dev = dev_id; |
1199 | long e8390_base; | 1199 | long e8390_base; |