diff options
Diffstat (limited to 'drivers/net/znet.c')
-rw-r--r-- | drivers/net/znet.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/znet.c b/drivers/net/znet.c index 656d5a02908b..b24b0727108c 100644 --- a/drivers/net/znet.c +++ b/drivers/net/znet.c | |||
@@ -158,7 +158,7 @@ struct netidblk { | |||
158 | 158 | ||
159 | static int znet_open(struct net_device *dev); | 159 | static int znet_open(struct net_device *dev); |
160 | static int znet_send_packet(struct sk_buff *skb, struct net_device *dev); | 160 | static int znet_send_packet(struct sk_buff *skb, struct net_device *dev); |
161 | static irqreturn_t znet_interrupt(int irq, void *dev_id, struct pt_regs *regs); | 161 | static irqreturn_t znet_interrupt(int irq, void *dev_id); |
162 | static void znet_rx(struct net_device *dev); | 162 | static void znet_rx(struct net_device *dev); |
163 | static int znet_close(struct net_device *dev); | 163 | static int znet_close(struct net_device *dev); |
164 | static struct net_device_stats *net_get_stats(struct net_device *dev); | 164 | static struct net_device_stats *net_get_stats(struct net_device *dev); |
@@ -602,7 +602,7 @@ static int znet_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
602 | } | 602 | } |
603 | 603 | ||
604 | /* The ZNET interrupt handler. */ | 604 | /* The ZNET interrupt handler. */ |
605 | static irqreturn_t znet_interrupt(int irq, void *dev_id, struct pt_regs * regs) | 605 | static irqreturn_t znet_interrupt(int irq, void *dev_id) |
606 | { | 606 | { |
607 | struct net_device *dev = dev_id; | 607 | struct net_device *dev = dev_id; |
608 | struct znet_private *znet = dev->priv; | 608 | struct znet_private *znet = dev->priv; |
@@ -610,11 +610,6 @@ static irqreturn_t znet_interrupt(int irq, void *dev_id, struct pt_regs * regs) | |||
610 | int boguscnt = 20; | 610 | int boguscnt = 20; |
611 | int handled = 0; | 611 | int handled = 0; |
612 | 612 | ||
613 | if (dev == NULL) { | ||
614 | printk(KERN_WARNING "znet_interrupt(): IRQ %d for unknown device.\n", irq); | ||
615 | return IRQ_NONE; | ||
616 | } | ||
617 | |||
618 | spin_lock (&znet->lock); | 613 | spin_lock (&znet->lock); |
619 | 614 | ||
620 | ioaddr = dev->base_addr; | 615 | ioaddr = dev->base_addr; |