diff options
Diffstat (limited to 'drivers/net/atp.c')
-rw-r--r-- | drivers/net/atp.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/net/atp.c b/drivers/net/atp.c index f2c8e0d5497b..2d306fcb7f36 100644 --- a/drivers/net/atp.c +++ b/drivers/net/atp.c | |||
@@ -203,7 +203,7 @@ static void hardware_init(struct net_device *dev); | |||
203 | static void write_packet(long ioaddr, int length, unsigned char *packet, int pad, int mode); | 203 | static void write_packet(long ioaddr, int length, unsigned char *packet, int pad, int mode); |
204 | static void trigger_send(long ioaddr, int length); | 204 | static void trigger_send(long ioaddr, int length); |
205 | static int atp_send_packet(struct sk_buff *skb, struct net_device *dev); | 205 | static int atp_send_packet(struct sk_buff *skb, struct net_device *dev); |
206 | static irqreturn_t atp_interrupt(int irq, void *dev_id, struct pt_regs *regs); | 206 | static irqreturn_t atp_interrupt(int irq, void *dev_id); |
207 | static void net_rx(struct net_device *dev); | 207 | static void net_rx(struct net_device *dev); |
208 | static void read_block(long ioaddr, int length, unsigned char *buffer, int data_mode); | 208 | static void read_block(long ioaddr, int length, unsigned char *buffer, int data_mode); |
209 | static int net_close(struct net_device *dev); | 209 | static int net_close(struct net_device *dev); |
@@ -596,20 +596,15 @@ static int atp_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
596 | 596 | ||
597 | /* The typical workload of the driver: | 597 | /* The typical workload of the driver: |
598 | Handle the network interface interrupts. */ | 598 | Handle the network interface interrupts. */ |
599 | static irqreturn_t | 599 | static irqreturn_t atp_interrupt(int irq, void *dev_instance) |
600 | atp_interrupt(int irq, void *dev_instance, struct pt_regs * regs) | ||
601 | { | 600 | { |
602 | struct net_device *dev = (struct net_device *)dev_instance; | 601 | struct net_device *dev = dev_instance; |
603 | struct net_local *lp; | 602 | struct net_local *lp; |
604 | long ioaddr; | 603 | long ioaddr; |
605 | static int num_tx_since_rx; | 604 | static int num_tx_since_rx; |
606 | int boguscount = max_interrupt_work; | 605 | int boguscount = max_interrupt_work; |
607 | int handled = 0; | 606 | int handled = 0; |
608 | 607 | ||
609 | if (dev == NULL) { | ||
610 | printk(KERN_ERR "ATP_interrupt(): irq %d for unknown device.\n", irq); | ||
611 | return IRQ_NONE; | ||
612 | } | ||
613 | ioaddr = dev->base_addr; | 608 | ioaddr = dev->base_addr; |
614 | lp = netdev_priv(dev); | 609 | lp = netdev_priv(dev); |
615 | 610 | ||