aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/8390.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/8390.c')
-rw-r--r--drivers/net/8390.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/net/8390.c b/drivers/net/8390.c
index 9d34056147ad..3d1c599ac3cb 100644
--- a/drivers/net/8390.c
+++ b/drivers/net/8390.c
@@ -391,7 +391,6 @@ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev)
391 * ei_interrupt - handle the interrupts from an 8390 391 * ei_interrupt - handle the interrupts from an 8390
392 * @irq: interrupt number 392 * @irq: interrupt number
393 * @dev_id: a pointer to the net_device 393 * @dev_id: a pointer to the net_device
394 * @regs: unused
395 * 394 *
396 * Handle the ether interface interrupts. We pull packets from 395 * Handle the ether interface interrupts. We pull packets from
397 * the 8390 via the card specific functions and fire them at the networking 396 * the 8390 via the card specific functions and fire them at the networking
@@ -400,21 +399,15 @@ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev)
400 * needed. 399 * needed.
401 */ 400 */
402 401
403irqreturn_t ei_interrupt(int irq, void *dev_id, struct pt_regs * regs) 402irqreturn_t ei_interrupt(int irq, void *dev_id)
404{ 403{
405 struct net_device *dev = dev_id; 404 struct net_device *dev = dev_id;
406 long e8390_base; 405 long e8390_base;
407 int interrupts, nr_serviced = 0; 406 int interrupts, nr_serviced = 0;
408 struct ei_device *ei_local; 407 struct ei_device *ei_local;
409 408
410 if (dev == NULL)
411 {
412 printk ("net_interrupt(): irq %d for unknown device.\n", irq);
413 return IRQ_NONE;
414 }
415
416 e8390_base = dev->base_addr; 409 e8390_base = dev->base_addr;
417 ei_local = (struct ei_device *) netdev_priv(dev); 410 ei_local = netdev_priv(dev);
418 411
419 /* 412 /*
420 * Protect the irq test too. 413 * Protect the irq test too.
@@ -506,7 +499,7 @@ irqreturn_t ei_interrupt(int irq, void *dev_id, struct pt_regs * regs)
506void ei_poll(struct net_device *dev) 499void ei_poll(struct net_device *dev)
507{ 500{
508 disable_irq_lockdep(dev->irq); 501 disable_irq_lockdep(dev->irq);
509 ei_interrupt(dev->irq, dev, NULL); 502 ei_interrupt(dev->irq, dev);
510 enable_irq_lockdep(dev->irq); 503 enable_irq_lockdep(dev->irq);
511} 504}
512#endif 505#endif