diff options
Diffstat (limited to 'drivers/net/pcmcia/pcnet_cs.c')
-rw-r--r-- | drivers/net/pcmcia/pcnet_cs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c index a09c22840f63..0c00d182e7fd 100644 --- a/drivers/net/pcmcia/pcnet_cs.c +++ b/drivers/net/pcmcia/pcnet_cs.c | |||
@@ -109,7 +109,7 @@ static int pcnet_open(struct net_device *dev); | |||
109 | static int pcnet_close(struct net_device *dev); | 109 | static int pcnet_close(struct net_device *dev); |
110 | static int ei_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); | 110 | static int ei_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); |
111 | static const struct ethtool_ops netdev_ethtool_ops; | 111 | static const struct ethtool_ops netdev_ethtool_ops; |
112 | static irqreturn_t ei_irq_wrapper(int irq, void *dev_id, struct pt_regs *regs); | 112 | static irqreturn_t ei_irq_wrapper(int irq, void *dev_id); |
113 | static void ei_watchdog(u_long arg); | 113 | static void ei_watchdog(u_long arg); |
114 | static void pcnet_reset_8390(struct net_device *dev); | 114 | static void pcnet_reset_8390(struct net_device *dev); |
115 | static int set_config(struct net_device *dev, struct ifmap *map); | 115 | static int set_config(struct net_device *dev, struct ifmap *map); |
@@ -1071,11 +1071,11 @@ static int set_config(struct net_device *dev, struct ifmap *map) | |||
1071 | 1071 | ||
1072 | /*====================================================================*/ | 1072 | /*====================================================================*/ |
1073 | 1073 | ||
1074 | static irqreturn_t ei_irq_wrapper(int irq, void *dev_id, struct pt_regs *regs) | 1074 | static irqreturn_t ei_irq_wrapper(int irq, void *dev_id) |
1075 | { | 1075 | { |
1076 | struct net_device *dev = dev_id; | 1076 | struct net_device *dev = dev_id; |
1077 | pcnet_dev_t *info; | 1077 | pcnet_dev_t *info; |
1078 | irqreturn_t ret = ei_interrupt(irq, dev_id, regs); | 1078 | irqreturn_t ret = ei_interrupt(irq, dev_id); |
1079 | 1079 | ||
1080 | if (ret == IRQ_HANDLED) { | 1080 | if (ret == IRQ_HANDLED) { |
1081 | info = PRIV(dev); | 1081 | info = PRIV(dev); |
@@ -1100,7 +1100,7 @@ static void ei_watchdog(u_long arg) | |||
1100 | if (info->stale++ && (inb_p(nic_base + EN0_ISR) & ENISR_ALL)) { | 1100 | if (info->stale++ && (inb_p(nic_base + EN0_ISR) & ENISR_ALL)) { |
1101 | if (!info->fast_poll) | 1101 | if (!info->fast_poll) |
1102 | printk(KERN_INFO "%s: interrupt(s) dropped!\n", dev->name); | 1102 | printk(KERN_INFO "%s: interrupt(s) dropped!\n", dev->name); |
1103 | ei_irq_wrapper(dev->irq, dev, NULL); | 1103 | ei_irq_wrapper(dev->irq, dev); |
1104 | info->fast_poll = HZ; | 1104 | info->fast_poll = HZ; |
1105 | } | 1105 | } |
1106 | if (info->fast_poll) { | 1106 | if (info->fast_poll) { |