diff options
Diffstat (limited to 'drivers/net/tulip')
-rw-r--r-- | drivers/net/tulip/dmfe.c | 2 | ||||
-rw-r--r-- | drivers/net/tulip/tulip_core.c | 4 | ||||
-rw-r--r-- | drivers/net/tulip/uli526x.c | 2 | ||||
-rw-r--r-- | drivers/net/tulip/winbond-840.c | 2 | ||||
-rw-r--r-- | drivers/net/tulip/xircom_cb.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c index a45ded0538b8..ad63621913c3 100644 --- a/drivers/net/tulip/dmfe.c +++ b/drivers/net/tulip/dmfe.c | |||
@@ -543,7 +543,7 @@ static int dmfe_open(struct DEVICE *dev) | |||
543 | 543 | ||
544 | DMFE_DBUG(0, "dmfe_open", 0); | 544 | DMFE_DBUG(0, "dmfe_open", 0); |
545 | 545 | ||
546 | ret = request_irq(dev->irq, &dmfe_interrupt, | 546 | ret = request_irq(dev->irq, dmfe_interrupt, |
547 | IRQF_SHARED, dev->name, dev); | 547 | IRQF_SHARED, dev->name, dev); |
548 | if (ret) | 548 | if (ret) |
549 | return ret; | 549 | return ret; |
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c index 6b2330e4206e..0df983bc03a6 100644 --- a/drivers/net/tulip/tulip_core.c +++ b/drivers/net/tulip/tulip_core.c | |||
@@ -506,7 +506,7 @@ tulip_open(struct net_device *dev) | |||
506 | 506 | ||
507 | tulip_init_ring (dev); | 507 | tulip_init_ring (dev); |
508 | 508 | ||
509 | retval = request_irq(dev->irq, &tulip_interrupt, IRQF_SHARED, dev->name, dev); | 509 | retval = request_irq(dev->irq, tulip_interrupt, IRQF_SHARED, dev->name, dev); |
510 | if (retval) | 510 | if (retval) |
511 | goto free_ring; | 511 | goto free_ring; |
512 | 512 | ||
@@ -1782,7 +1782,7 @@ static int tulip_resume(struct pci_dev *pdev) | |||
1782 | return retval; | 1782 | return retval; |
1783 | } | 1783 | } |
1784 | 1784 | ||
1785 | if ((retval = request_irq(dev->irq, &tulip_interrupt, IRQF_SHARED, dev->name, dev))) { | 1785 | if ((retval = request_irq(dev->irq, tulip_interrupt, IRQF_SHARED, dev->name, dev))) { |
1786 | printk (KERN_ERR "tulip: request_irq failed in resume\n"); | 1786 | printk (KERN_ERR "tulip: request_irq failed in resume\n"); |
1787 | return retval; | 1787 | return retval; |
1788 | } | 1788 | } |
diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c index c457a0ca55ad..fa019cabc355 100644 --- a/drivers/net/tulip/uli526x.c +++ b/drivers/net/tulip/uli526x.c | |||
@@ -461,7 +461,7 @@ static int uli526x_open(struct net_device *dev) | |||
461 | /* Initialize ULI526X board */ | 461 | /* Initialize ULI526X board */ |
462 | uli526x_init(dev); | 462 | uli526x_init(dev); |
463 | 463 | ||
464 | ret = request_irq(dev->irq, &uli526x_interrupt, IRQF_SHARED, dev->name, dev); | 464 | ret = request_irq(dev->irq, uli526x_interrupt, IRQF_SHARED, dev->name, dev); |
465 | if (ret) | 465 | if (ret) |
466 | return ret; | 466 | return ret; |
467 | 467 | ||
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c index b38d3b7f6e35..1a52729c9466 100644 --- a/drivers/net/tulip/winbond-840.c +++ b/drivers/net/tulip/winbond-840.c | |||
@@ -639,7 +639,7 @@ static int netdev_open(struct net_device *dev) | |||
639 | iowrite32(0x00000001, ioaddr + PCIBusCfg); /* Reset */ | 639 | iowrite32(0x00000001, ioaddr + PCIBusCfg); /* Reset */ |
640 | 640 | ||
641 | netif_device_detach(dev); | 641 | netif_device_detach(dev); |
642 | i = request_irq(dev->irq, &intr_handler, IRQF_SHARED, dev->name, dev); | 642 | i = request_irq(dev->irq, intr_handler, IRQF_SHARED, dev->name, dev); |
643 | if (i) | 643 | if (i) |
644 | goto out_err; | 644 | goto out_err; |
645 | 645 | ||
diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c index 0f2ca5980c3c..9924c4c7e2d6 100644 --- a/drivers/net/tulip/xircom_cb.c +++ b/drivers/net/tulip/xircom_cb.c | |||
@@ -458,7 +458,7 @@ static int xircom_open(struct net_device *dev) | |||
458 | int retval; | 458 | int retval; |
459 | enter("xircom_open"); | 459 | enter("xircom_open"); |
460 | printk(KERN_INFO "xircom cardbus adaptor found, registering as %s, using irq %i \n",dev->name,dev->irq); | 460 | printk(KERN_INFO "xircom cardbus adaptor found, registering as %s, using irq %i \n",dev->name,dev->irq); |
461 | retval = request_irq(dev->irq, &xircom_interrupt, IRQF_SHARED, dev->name, dev); | 461 | retval = request_irq(dev->irq, xircom_interrupt, IRQF_SHARED, dev->name, dev); |
462 | if (retval) { | 462 | if (retval) { |
463 | leave("xircom_open - No IRQ"); | 463 | leave("xircom_open - No IRQ"); |
464 | return retval; | 464 | return retval; |