diff options
author | Joe Perches <joe@perches.com> | 2009-11-19 02:29:17 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-19 02:29:17 -0500 |
commit | a0607fd3a25ba1848a63a0d925e36d914735ab47 (patch) | |
tree | c9bbdf40c9ded30af844e80870a7180ce0c0cb5c /drivers/net | |
parent | 2939e275994977b6c9eb7fd082b7b0caa35b96b0 (diff) |
drivers/net: request_irq - Remove unnecessary leading & from second arg
Not as fancy as coccinelle. Checkpatch errors ignored.
Compile tested allyesconfig x86, not all files compiled.
grep -rPl --include=*.[ch] "\brequest_irq\s*\([^,\)]+,\s*\&" drivers/net | while read file ; do \
perl -i -e 'local $/; while (<>) { s@(\brequest_irq\s*\([^,\)]+,\s*)\&@\1@g ; print ; }' $file ;\
done
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
96 files changed, 131 insertions, 131 deletions
diff --git a/drivers/net/3c501.c b/drivers/net/3c501.c index f60309175ef5..62ceb2b4820c 100644 --- a/drivers/net/3c501.c +++ b/drivers/net/3c501.c | |||
@@ -345,7 +345,7 @@ static int el_open(struct net_device *dev) | |||
345 | if (el_debug > 2) | 345 | if (el_debug > 2) |
346 | pr_debug("%s: Doing el_open()...\n", dev->name); | 346 | pr_debug("%s: Doing el_open()...\n", dev->name); |
347 | 347 | ||
348 | retval = request_irq(dev->irq, &el_interrupt, 0, dev->name, dev); | 348 | retval = request_irq(dev->irq, el_interrupt, 0, dev->name, dev); |
349 | if (retval) | 349 | if (retval) |
350 | return retval; | 350 | return retval; |
351 | 351 | ||
diff --git a/drivers/net/3c505.c b/drivers/net/3c505.c index a21c9d15ef8a..9257d7ce0378 100644 --- a/drivers/net/3c505.c +++ b/drivers/net/3c505.c | |||
@@ -886,7 +886,7 @@ static int elp_open(struct net_device *dev) | |||
886 | /* | 886 | /* |
887 | * install our interrupt service routine | 887 | * install our interrupt service routine |
888 | */ | 888 | */ |
889 | if ((retval = request_irq(dev->irq, &elp_interrupt, 0, dev->name, dev))) { | 889 | if ((retval = request_irq(dev->irq, elp_interrupt, 0, dev->name, dev))) { |
890 | pr_err("%s: could not allocate IRQ%d\n", dev->name, dev->irq); | 890 | pr_err("%s: could not allocate IRQ%d\n", dev->name, dev->irq); |
891 | return retval; | 891 | return retval; |
892 | } | 892 | } |
diff --git a/drivers/net/3c507.c b/drivers/net/3c507.c index a6dc8bcbc7df..605f1d17a8f3 100644 --- a/drivers/net/3c507.c +++ b/drivers/net/3c507.c | |||
@@ -399,7 +399,7 @@ static int __init el16_probe1(struct net_device *dev, int ioaddr) | |||
399 | 399 | ||
400 | irq = inb(ioaddr + IRQ_CONFIG) & 0x0f; | 400 | irq = inb(ioaddr + IRQ_CONFIG) & 0x0f; |
401 | 401 | ||
402 | irqval = request_irq(irq, &el16_interrupt, 0, DRV_NAME, dev); | 402 | irqval = request_irq(irq, el16_interrupt, 0, DRV_NAME, dev); |
403 | if (irqval) { | 403 | if (irqval) { |
404 | pr_cont("\n"); | 404 | pr_cont("\n"); |
405 | pr_err("3c507: unable to get IRQ %d (irqval=%d).\n", irq, irqval); | 405 | pr_err("3c507: unable to get IRQ %d (irqval=%d).\n", irq, irqval); |
diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c index 3b00a4e927aa..8d4ce0964073 100644 --- a/drivers/net/3c509.c +++ b/drivers/net/3c509.c | |||
@@ -780,7 +780,7 @@ el3_open(struct net_device *dev) | |||
780 | outw(RxReset, ioaddr + EL3_CMD); | 780 | outw(RxReset, ioaddr + EL3_CMD); |
781 | outw(SetStatusEnb | 0x00, ioaddr + EL3_CMD); | 781 | outw(SetStatusEnb | 0x00, ioaddr + EL3_CMD); |
782 | 782 | ||
783 | i = request_irq(dev->irq, &el3_interrupt, 0, dev->name, dev); | 783 | i = request_irq(dev->irq, el3_interrupt, 0, dev->name, dev); |
784 | if (i) | 784 | if (i) |
785 | return i; | 785 | return i; |
786 | 786 | ||
diff --git a/drivers/net/3c515.c b/drivers/net/3c515.c index 4adcb950f5f1..37faf36e2457 100644 --- a/drivers/net/3c515.c +++ b/drivers/net/3c515.c | |||
@@ -766,11 +766,11 @@ static int corkscrew_open(struct net_device *dev) | |||
766 | /* Corkscrew: Cannot share ISA resources. */ | 766 | /* Corkscrew: Cannot share ISA resources. */ |
767 | if (dev->irq == 0 | 767 | if (dev->irq == 0 |
768 | || dev->dma == 0 | 768 | || dev->dma == 0 |
769 | || request_irq(dev->irq, &corkscrew_interrupt, 0, | 769 | || request_irq(dev->irq, corkscrew_interrupt, 0, |
770 | vp->product_name, dev)) return -EAGAIN; | 770 | vp->product_name, dev)) return -EAGAIN; |
771 | enable_dma(dev->dma); | 771 | enable_dma(dev->dma); |
772 | set_dma_mode(dev->dma, DMA_MODE_CASCADE); | 772 | set_dma_mode(dev->dma, DMA_MODE_CASCADE); |
773 | } else if (request_irq(dev->irq, &corkscrew_interrupt, IRQF_SHARED, | 773 | } else if (request_irq(dev->irq, corkscrew_interrupt, IRQF_SHARED, |
774 | vp->product_name, dev)) { | 774 | vp->product_name, dev)) { |
775 | return -EAGAIN; | 775 | return -EAGAIN; |
776 | } | 776 | } |
diff --git a/drivers/net/3c523.c b/drivers/net/3c523.c index cb0b730799ba..27d80ca5e4c0 100644 --- a/drivers/net/3c523.c +++ b/drivers/net/3c523.c | |||
@@ -288,7 +288,7 @@ static int elmc_open(struct net_device *dev) | |||
288 | 288 | ||
289 | elmc_id_attn586(); /* disable interrupts */ | 289 | elmc_id_attn586(); /* disable interrupts */ |
290 | 290 | ||
291 | ret = request_irq(dev->irq, &elmc_interrupt, IRQF_SHARED | IRQF_SAMPLE_RANDOM, | 291 | ret = request_irq(dev->irq, elmc_interrupt, IRQF_SHARED | IRQF_SAMPLE_RANDOM, |
292 | dev->name, dev); | 292 | dev->name, dev); |
293 | if (ret) { | 293 | if (ret) { |
294 | pr_err("%s: couldn't get irq %d\n", dev->name, dev->irq); | 294 | pr_err("%s: couldn't get irq %d\n", dev->name, dev->irq); |
diff --git a/drivers/net/3c527.c b/drivers/net/3c527.c index 6021e6dded8f..d91c3464fe72 100644 --- a/drivers/net/3c527.c +++ b/drivers/net/3c527.c | |||
@@ -443,7 +443,7 @@ static int __init mc32_probe1(struct net_device *dev, int slot) | |||
443 | * Grab the IRQ | 443 | * Grab the IRQ |
444 | */ | 444 | */ |
445 | 445 | ||
446 | err = request_irq(dev->irq, &mc32_interrupt, IRQF_SHARED | IRQF_SAMPLE_RANDOM, DRV_NAME, dev); | 446 | err = request_irq(dev->irq, mc32_interrupt, IRQF_SHARED | IRQF_SAMPLE_RANDOM, DRV_NAME, dev); |
447 | if (err) { | 447 | if (err) { |
448 | release_region(dev->base_addr, MC32_IO_EXTENT); | 448 | release_region(dev->base_addr, MC32_IO_EXTENT); |
449 | pr_err("%s: unable to get IRQ %d.\n", DRV_NAME, dev->irq); | 449 | pr_err("%s: unable to get IRQ %d.\n", DRV_NAME, dev->irq); |
diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c index b5dc7f550725..50cecf417471 100644 --- a/drivers/net/appletalk/cops.c +++ b/drivers/net/appletalk/cops.c | |||
@@ -328,7 +328,7 @@ static int __init cops_probe1(struct net_device *dev, int ioaddr) | |||
328 | 328 | ||
329 | /* Reserve any actual interrupt. */ | 329 | /* Reserve any actual interrupt. */ |
330 | if (dev->irq) { | 330 | if (dev->irq) { |
331 | retval = request_irq(dev->irq, &cops_interrupt, 0, dev->name, dev); | 331 | retval = request_irq(dev->irq, cops_interrupt, 0, dev->name, dev); |
332 | if (retval) | 332 | if (retval) |
333 | goto err_out; | 333 | goto err_out; |
334 | } | 334 | } |
diff --git a/drivers/net/appletalk/ltpc.c b/drivers/net/appletalk/ltpc.c index 08760baece7a..dbfbd3b7ff86 100644 --- a/drivers/net/appletalk/ltpc.c +++ b/drivers/net/appletalk/ltpc.c | |||
@@ -1158,7 +1158,7 @@ struct net_device * __init ltpc_probe(void) | |||
1158 | } | 1158 | } |
1159 | 1159 | ||
1160 | /* grab it and don't let go :-) */ | 1160 | /* grab it and don't let go :-) */ |
1161 | if (irq && request_irq( irq, <pc_interrupt, 0, "ltpc", dev) >= 0) | 1161 | if (irq && request_irq( irq, ltpc_interrupt, 0, "ltpc", dev) >= 0) |
1162 | { | 1162 | { |
1163 | (void) inb_p(io+7); /* enable interrupts from board */ | 1163 | (void) inb_p(io+7); /* enable interrupts from board */ |
1164 | (void) inb_p(io+7); /* and reset irq line */ | 1164 | (void) inb_p(io+7); /* and reset irq line */ |
diff --git a/drivers/net/arcnet/arc-rimi.c b/drivers/net/arcnet/arc-rimi.c index e3082a9350fc..c5b988140a91 100644 --- a/drivers/net/arcnet/arc-rimi.c +++ b/drivers/net/arcnet/arc-rimi.c | |||
@@ -156,7 +156,7 @@ static int __init arcrimi_found(struct net_device *dev) | |||
156 | } | 156 | } |
157 | 157 | ||
158 | /* reserve the irq */ | 158 | /* reserve the irq */ |
159 | if (request_irq(dev->irq, &arcnet_interrupt, 0, "arcnet (RIM I)", dev)) { | 159 | if (request_irq(dev->irq, arcnet_interrupt, 0, "arcnet (RIM I)", dev)) { |
160 | iounmap(p); | 160 | iounmap(p); |
161 | release_mem_region(dev->mem_start, MIRROR_SIZE); | 161 | release_mem_region(dev->mem_start, MIRROR_SIZE); |
162 | BUGMSG(D_NORMAL, "Can't get IRQ %d!\n", dev->irq); | 162 | BUGMSG(D_NORMAL, "Can't get IRQ %d!\n", dev->irq); |
diff --git a/drivers/net/arcnet/com20020.c b/drivers/net/arcnet/com20020.c index 651275a5f3d2..0a74f21409c5 100644 --- a/drivers/net/arcnet/com20020.c +++ b/drivers/net/arcnet/com20020.c | |||
@@ -200,7 +200,7 @@ int com20020_found(struct net_device *dev, int shared) | |||
200 | outb(dev->dev_addr[0], _XREG); | 200 | outb(dev->dev_addr[0], _XREG); |
201 | 201 | ||
202 | /* reserve the irq */ | 202 | /* reserve the irq */ |
203 | if (request_irq(dev->irq, &arcnet_interrupt, shared, | 203 | if (request_irq(dev->irq, arcnet_interrupt, shared, |
204 | "arcnet (COM20020)", dev)) { | 204 | "arcnet (COM20020)", dev)) { |
205 | BUGMSG(D_NORMAL, "Can't get IRQ %d!\n", dev->irq); | 205 | BUGMSG(D_NORMAL, "Can't get IRQ %d!\n", dev->irq); |
206 | return -ENODEV; | 206 | return -ENODEV; |
diff --git a/drivers/net/arcnet/com90io.c b/drivers/net/arcnet/com90io.c index 89de29b3b1dc..28dea518d554 100644 --- a/drivers/net/arcnet/com90io.c +++ b/drivers/net/arcnet/com90io.c | |||
@@ -238,7 +238,7 @@ static int __init com90io_found(struct net_device *dev) | |||
238 | int err; | 238 | int err; |
239 | 239 | ||
240 | /* Reserve the irq */ | 240 | /* Reserve the irq */ |
241 | if (request_irq(dev->irq, &arcnet_interrupt, 0, "arcnet (COM90xx-IO)", dev)) { | 241 | if (request_irq(dev->irq, arcnet_interrupt, 0, "arcnet (COM90xx-IO)", dev)) { |
242 | BUGMSG(D_NORMAL, "Can't get IRQ %d!\n", dev->irq); | 242 | BUGMSG(D_NORMAL, "Can't get IRQ %d!\n", dev->irq); |
243 | return -ENODEV; | 243 | return -ENODEV; |
244 | } | 244 | } |
diff --git a/drivers/net/arcnet/com90xx.c b/drivers/net/arcnet/com90xx.c index d762fe46251e..112e230cb13d 100644 --- a/drivers/net/arcnet/com90xx.c +++ b/drivers/net/arcnet/com90xx.c | |||
@@ -501,7 +501,7 @@ static int __init com90xx_found(int ioaddr, int airq, u_long shmem, void __iomem | |||
501 | goto err_free_dev; | 501 | goto err_free_dev; |
502 | 502 | ||
503 | /* reserve the irq */ | 503 | /* reserve the irq */ |
504 | if (request_irq(airq, &arcnet_interrupt, 0, "arcnet (90xx)", dev)) { | 504 | if (request_irq(airq, arcnet_interrupt, 0, "arcnet (90xx)", dev)) { |
505 | BUGMSG(D_NORMAL, "Can't get IRQ %d!\n", airq); | 505 | BUGMSG(D_NORMAL, "Can't get IRQ %d!\n", airq); |
506 | goto err_release_mem; | 506 | goto err_release_mem; |
507 | } | 507 | } |
diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c index 544d5af6950e..d4ab69f032be 100644 --- a/drivers/net/at1700.c +++ b/drivers/net/at1700.c | |||
@@ -468,7 +468,7 @@ found: | |||
468 | lp->jumpered = is_fmv18x; | 468 | lp->jumpered = is_fmv18x; |
469 | lp->mca_slot = slot; | 469 | lp->mca_slot = slot; |
470 | /* Snarf the interrupt vector now. */ | 470 | /* Snarf the interrupt vector now. */ |
471 | ret = request_irq(irq, &net_interrupt, 0, DRV_NAME, dev); | 471 | ret = request_irq(irq, net_interrupt, 0, DRV_NAME, dev); |
472 | if (ret) { | 472 | if (ret) { |
473 | printk(KERN_ERR "AT1700 at %#3x is unusable due to a " | 473 | printk(KERN_ERR "AT1700 at %#3x is unusable due to a " |
474 | "conflict on IRQ %d.\n", | 474 | "conflict on IRQ %d.\n", |
diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c index 8b889ab544b0..ad17e74e5662 100644 --- a/drivers/net/atl1e/atl1e_main.c +++ b/drivers/net/atl1e/atl1e_main.c | |||
@@ -1930,7 +1930,7 @@ static int atl1e_request_irq(struct atl1e_adapter *adapter) | |||
1930 | 1930 | ||
1931 | if (!adapter->have_msi) | 1931 | if (!adapter->have_msi) |
1932 | flags |= IRQF_SHARED; | 1932 | flags |= IRQF_SHARED; |
1933 | err = request_irq(adapter->pdev->irq, &atl1e_intr, flags, | 1933 | err = request_irq(adapter->pdev->irq, atl1e_intr, flags, |
1934 | netdev->name, netdev); | 1934 | netdev->name, netdev); |
1935 | if (err) { | 1935 | if (err) { |
1936 | dev_dbg(&pdev->dev, | 1936 | dev_dbg(&pdev->dev, |
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c index 963df502260a..e547f788a266 100644 --- a/drivers/net/atlx/atl1.c +++ b/drivers/net/atlx/atl1.c | |||
@@ -2589,7 +2589,7 @@ static s32 atl1_up(struct atl1_adapter *adapter) | |||
2589 | irq_flags |= IRQF_SHARED; | 2589 | irq_flags |= IRQF_SHARED; |
2590 | } | 2590 | } |
2591 | 2591 | ||
2592 | err = request_irq(adapter->pdev->irq, &atl1_intr, irq_flags, | 2592 | err = request_irq(adapter->pdev->irq, atl1_intr, irq_flags, |
2593 | netdev->name, netdev); | 2593 | netdev->name, netdev); |
2594 | if (unlikely(err)) | 2594 | if (unlikely(err)) |
2595 | goto err_up; | 2595 | goto err_up; |
diff --git a/drivers/net/atlx/atl2.c b/drivers/net/atlx/atl2.c index 0d268075bad5..c0451d75cdcf 100644 --- a/drivers/net/atlx/atl2.c +++ b/drivers/net/atlx/atl2.c | |||
@@ -651,7 +651,7 @@ static int atl2_request_irq(struct atl2_adapter *adapter) | |||
651 | if (adapter->have_msi) | 651 | if (adapter->have_msi) |
652 | flags &= ~IRQF_SHARED; | 652 | flags &= ~IRQF_SHARED; |
653 | 653 | ||
654 | return request_irq(adapter->pdev->irq, &atl2_intr, flags, netdev->name, | 654 | return request_irq(adapter->pdev->irq, atl2_intr, flags, netdev->name, |
655 | netdev); | 655 | netdev); |
656 | } | 656 | } |
657 | 657 | ||
diff --git a/drivers/net/atp.c b/drivers/net/atp.c index 9043294fe617..001791775be3 100644 --- a/drivers/net/atp.c +++ b/drivers/net/atp.c | |||
@@ -437,7 +437,7 @@ static int net_open(struct net_device *dev) | |||
437 | /* The interrupt line is turned off (tri-stated) when the device isn't in | 437 | /* The interrupt line is turned off (tri-stated) when the device isn't in |
438 | use. That's especially important for "attached" interfaces where the | 438 | use. That's especially important for "attached" interfaces where the |
439 | port or interrupt may be shared. */ | 439 | port or interrupt may be shared. */ |
440 | ret = request_irq(dev->irq, &atp_interrupt, 0, dev->name, dev); | 440 | ret = request_irq(dev->irq, atp_interrupt, 0, dev->name, dev); |
441 | if (ret) | 441 | if (ret) |
442 | return ret; | 442 | return ret; |
443 | 443 | ||
diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c index ce6f1ac25df8..e67533cf78d8 100644 --- a/drivers/net/au1000_eth.c +++ b/drivers/net/au1000_eth.c | |||
@@ -881,7 +881,7 @@ static int au1000_open(struct net_device *dev) | |||
881 | if (au1000_debug > 4) | 881 | if (au1000_debug > 4) |
882 | printk("%s: open: dev=%p\n", dev->name, dev); | 882 | printk("%s: open: dev=%p\n", dev->name, dev); |
883 | 883 | ||
884 | if ((retval = request_irq(dev->irq, &au1000_interrupt, 0, | 884 | if ((retval = request_irq(dev->irq, au1000_interrupt, 0, |
885 | dev->name, dev))) { | 885 | dev->name, dev))) { |
886 | printk(KERN_ERR "%s: unable to get IRQ %d\n", | 886 | printk(KERN_ERR "%s: unable to get IRQ %d\n", |
887 | dev->name, dev->irq); | 887 | dev->name, dev->irq); |
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c index 0c54219960e2..af9321617ce4 100644 --- a/drivers/net/cs89x0.c +++ b/drivers/net/cs89x0.c | |||
@@ -1323,7 +1323,7 @@ net_open(struct net_device *dev) | |||
1323 | writereg(dev, PP_BusCTL, ENABLE_IRQ | MEMORY_ON); | 1323 | writereg(dev, PP_BusCTL, ENABLE_IRQ | MEMORY_ON); |
1324 | #endif | 1324 | #endif |
1325 | write_irq(dev, lp->chip_type, dev->irq); | 1325 | write_irq(dev, lp->chip_type, dev->irq); |
1326 | ret = request_irq(dev->irq, &net_interrupt, 0, dev->name, dev); | 1326 | ret = request_irq(dev->irq, net_interrupt, 0, dev->name, dev); |
1327 | if (ret) { | 1327 | if (ret) { |
1328 | if (net_debug) | 1328 | if (net_debug) |
1329 | printk(KERN_DEBUG "cs89x0: request_irq(%d) failed\n", dev->irq); | 1329 | printk(KERN_DEBUG "cs89x0: request_irq(%d) failed\n", dev->irq); |
diff --git a/drivers/net/declance.c b/drivers/net/declance.c index a31696a3928e..be9590253aa1 100644 --- a/drivers/net/declance.c +++ b/drivers/net/declance.c | |||
@@ -801,14 +801,14 @@ static int lance_open(struct net_device *dev) | |||
801 | netif_start_queue(dev); | 801 | netif_start_queue(dev); |
802 | 802 | ||
803 | /* Associate IRQ with lance_interrupt */ | 803 | /* Associate IRQ with lance_interrupt */ |
804 | if (request_irq(dev->irq, &lance_interrupt, 0, "lance", dev)) { | 804 | if (request_irq(dev->irq, lance_interrupt, 0, "lance", dev)) { |
805 | printk("%s: Can't get IRQ %d\n", dev->name, dev->irq); | 805 | printk("%s: Can't get IRQ %d\n", dev->name, dev->irq); |
806 | return -EAGAIN; | 806 | return -EAGAIN; |
807 | } | 807 | } |
808 | if (lp->dma_irq >= 0) { | 808 | if (lp->dma_irq >= 0) { |
809 | unsigned long flags; | 809 | unsigned long flags; |
810 | 810 | ||
811 | if (request_irq(lp->dma_irq, &lance_dma_merr_int, 0, | 811 | if (request_irq(lp->dma_irq, lance_dma_merr_int, 0, |
812 | "lance error", dev)) { | 812 | "lance error", dev)) { |
813 | free_irq(dev->irq, dev); | 813 | free_irq(dev->irq, dev); |
814 | printk("%s: Can't get DMA IRQ %d\n", dev->name, | 814 | printk("%s: Can't get DMA IRQ %d\n", dev->name, |
diff --git a/drivers/net/depca.c b/drivers/net/depca.c index 7a3bdac84abe..0c1f491d20bf 100644 --- a/drivers/net/depca.c +++ b/drivers/net/depca.c | |||
@@ -849,7 +849,7 @@ static int depca_open(struct net_device *dev) | |||
849 | 849 | ||
850 | depca_dbg_open(dev); | 850 | depca_dbg_open(dev); |
851 | 851 | ||
852 | if (request_irq(dev->irq, &depca_interrupt, 0, lp->adapter_name, dev)) { | 852 | if (request_irq(dev->irq, depca_interrupt, 0, lp->adapter_name, dev)) { |
853 | printk("depca_open(): Requested IRQ%d is busy\n", dev->irq); | 853 | printk("depca_open(): Requested IRQ%d is busy\n", dev->irq); |
854 | status = -EAGAIN; | 854 | status = -EAGAIN; |
855 | } else { | 855 | } else { |
diff --git a/drivers/net/dl2k.c b/drivers/net/dl2k.c index ce8fef184f2c..a2f1860fdd16 100644 --- a/drivers/net/dl2k.c +++ b/drivers/net/dl2k.c | |||
@@ -411,7 +411,7 @@ rio_open (struct net_device *dev) | |||
411 | int i; | 411 | int i; |
412 | u16 macctrl; | 412 | u16 macctrl; |
413 | 413 | ||
414 | i = request_irq (dev->irq, &rio_interrupt, IRQF_SHARED, dev->name, dev); | 414 | i = request_irq (dev->irq, rio_interrupt, IRQF_SHARED, dev->name, dev); |
415 | if (i) | 415 | if (i) |
416 | return i; | 416 | return i; |
417 | 417 | ||
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c index 3aab2e466008..81590fbb9943 100644 --- a/drivers/net/dm9000.c +++ b/drivers/net/dm9000.c | |||
@@ -1175,7 +1175,7 @@ dm9000_open(struct net_device *dev) | |||
1175 | 1175 | ||
1176 | irqflags |= IRQF_SHARED; | 1176 | irqflags |= IRQF_SHARED; |
1177 | 1177 | ||
1178 | if (request_irq(dev->irq, &dm9000_interrupt, irqflags, dev->name, dev)) | 1178 | if (request_irq(dev->irq, dm9000_interrupt, irqflags, dev->name, dev)) |
1179 | return -EAGAIN; | 1179 | return -EAGAIN; |
1180 | 1180 | ||
1181 | /* Initialize DM9000 board */ | 1181 | /* Initialize DM9000 board */ |
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c index ffbae0a0b4f1..13e9ece16889 100644 --- a/drivers/net/e1000/e1000_ethtool.c +++ b/drivers/net/e1000/e1000_ethtool.c | |||
@@ -869,10 +869,10 @@ static int e1000_intr_test(struct e1000_adapter *adapter, u64 *data) | |||
869 | 869 | ||
870 | /* NOTE: we don't test MSI interrupts here, yet */ | 870 | /* NOTE: we don't test MSI interrupts here, yet */ |
871 | /* Hook up test interrupt handler just for this test */ | 871 | /* Hook up test interrupt handler just for this test */ |
872 | if (!request_irq(irq, &e1000_test_intr, IRQF_PROBE_SHARED, netdev->name, | 872 | if (!request_irq(irq, e1000_test_intr, IRQF_PROBE_SHARED, netdev->name, |
873 | netdev)) | 873 | netdev)) |
874 | shared_int = false; | 874 | shared_int = false; |
875 | else if (request_irq(irq, &e1000_test_intr, IRQF_SHARED, | 875 | else if (request_irq(irq, e1000_test_intr, IRQF_SHARED, |
876 | netdev->name, netdev)) { | 876 | netdev->name, netdev)) { |
877 | *data = 1; | 877 | *data = 1; |
878 | return -1; | 878 | return -1; |
diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c index 0364b91488af..c430dc8b70a3 100644 --- a/drivers/net/e1000e/ethtool.c +++ b/drivers/net/e1000e/ethtool.c | |||
@@ -937,10 +937,10 @@ static int e1000_intr_test(struct e1000_adapter *adapter, u64 *data) | |||
937 | e1000e_set_interrupt_capability(adapter); | 937 | e1000e_set_interrupt_capability(adapter); |
938 | } | 938 | } |
939 | /* Hook up test interrupt handler just for this test */ | 939 | /* Hook up test interrupt handler just for this test */ |
940 | if (!request_irq(irq, &e1000_test_intr, IRQF_PROBE_SHARED, netdev->name, | 940 | if (!request_irq(irq, e1000_test_intr, IRQF_PROBE_SHARED, netdev->name, |
941 | netdev)) { | 941 | netdev)) { |
942 | shared_int = 0; | 942 | shared_int = 0; |
943 | } else if (request_irq(irq, &e1000_test_intr, IRQF_SHARED, | 943 | } else if (request_irq(irq, e1000_test_intr, IRQF_SHARED, |
944 | netdev->name, netdev)) { | 944 | netdev->name, netdev)) { |
945 | *data = 1; | 945 | *data = 1; |
946 | ret_val = -1; | 946 | ret_val = -1; |
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 376924804f3f..3caa1d5893c4 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c | |||
@@ -1458,7 +1458,7 @@ static int e1000_request_msix(struct e1000_adapter *adapter) | |||
1458 | else | 1458 | else |
1459 | memcpy(adapter->rx_ring->name, netdev->name, IFNAMSIZ); | 1459 | memcpy(adapter->rx_ring->name, netdev->name, IFNAMSIZ); |
1460 | err = request_irq(adapter->msix_entries[vector].vector, | 1460 | err = request_irq(adapter->msix_entries[vector].vector, |
1461 | &e1000_intr_msix_rx, 0, adapter->rx_ring->name, | 1461 | e1000_intr_msix_rx, 0, adapter->rx_ring->name, |
1462 | netdev); | 1462 | netdev); |
1463 | if (err) | 1463 | if (err) |
1464 | goto out; | 1464 | goto out; |
@@ -1471,7 +1471,7 @@ static int e1000_request_msix(struct e1000_adapter *adapter) | |||
1471 | else | 1471 | else |
1472 | memcpy(adapter->tx_ring->name, netdev->name, IFNAMSIZ); | 1472 | memcpy(adapter->tx_ring->name, netdev->name, IFNAMSIZ); |
1473 | err = request_irq(adapter->msix_entries[vector].vector, | 1473 | err = request_irq(adapter->msix_entries[vector].vector, |
1474 | &e1000_intr_msix_tx, 0, adapter->tx_ring->name, | 1474 | e1000_intr_msix_tx, 0, adapter->tx_ring->name, |
1475 | netdev); | 1475 | netdev); |
1476 | if (err) | 1476 | if (err) |
1477 | goto out; | 1477 | goto out; |
@@ -1480,7 +1480,7 @@ static int e1000_request_msix(struct e1000_adapter *adapter) | |||
1480 | vector++; | 1480 | vector++; |
1481 | 1481 | ||
1482 | err = request_irq(adapter->msix_entries[vector].vector, | 1482 | err = request_irq(adapter->msix_entries[vector].vector, |
1483 | &e1000_msix_other, 0, netdev->name, netdev); | 1483 | e1000_msix_other, 0, netdev->name, netdev); |
1484 | if (err) | 1484 | if (err) |
1485 | goto out; | 1485 | goto out; |
1486 | 1486 | ||
@@ -1511,7 +1511,7 @@ static int e1000_request_irq(struct e1000_adapter *adapter) | |||
1511 | e1000e_set_interrupt_capability(adapter); | 1511 | e1000e_set_interrupt_capability(adapter); |
1512 | } | 1512 | } |
1513 | if (adapter->flags & FLAG_MSI_ENABLED) { | 1513 | if (adapter->flags & FLAG_MSI_ENABLED) { |
1514 | err = request_irq(adapter->pdev->irq, &e1000_intr_msi, 0, | 1514 | err = request_irq(adapter->pdev->irq, e1000_intr_msi, 0, |
1515 | netdev->name, netdev); | 1515 | netdev->name, netdev); |
1516 | if (!err) | 1516 | if (!err) |
1517 | return err; | 1517 | return err; |
@@ -1521,7 +1521,7 @@ static int e1000_request_irq(struct e1000_adapter *adapter) | |||
1521 | adapter->int_mode = E1000E_INT_MODE_LEGACY; | 1521 | adapter->int_mode = E1000E_INT_MODE_LEGACY; |
1522 | } | 1522 | } |
1523 | 1523 | ||
1524 | err = request_irq(adapter->pdev->irq, &e1000_intr, IRQF_SHARED, | 1524 | err = request_irq(adapter->pdev->irq, e1000_intr, IRQF_SHARED, |
1525 | netdev->name, netdev); | 1525 | netdev->name, netdev); |
1526 | if (err) | 1526 | if (err) |
1527 | e_err("Unable to allocate interrupt, Error: %d\n", err); | 1527 | e_err("Unable to allocate interrupt, Error: %d\n", err); |
@@ -2970,7 +2970,7 @@ static int e1000_test_msi_interrupt(struct e1000_adapter *adapter) | |||
2970 | if (err) | 2970 | if (err) |
2971 | goto msi_test_failed; | 2971 | goto msi_test_failed; |
2972 | 2972 | ||
2973 | err = request_irq(adapter->pdev->irq, &e1000_intr_msi_test, 0, | 2973 | err = request_irq(adapter->pdev->irq, e1000_intr_msi_test, 0, |
2974 | netdev->name, netdev); | 2974 | netdev->name, netdev); |
2975 | if (err) { | 2975 | if (err) { |
2976 | pci_disable_msi(adapter->pdev); | 2976 | pci_disable_msi(adapter->pdev); |
diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c index 1e934160062c..94c59498cdb6 100644 --- a/drivers/net/eepro.c +++ b/drivers/net/eepro.c | |||
@@ -990,7 +990,7 @@ static int eepro_open(struct net_device *dev) | |||
990 | return -EAGAIN; | 990 | return -EAGAIN; |
991 | } | 991 | } |
992 | 992 | ||
993 | if (request_irq(dev->irq , &eepro_interrupt, 0, dev->name, dev)) { | 993 | if (request_irq(dev->irq , eepro_interrupt, 0, dev->name, dev)) { |
994 | printk(KERN_ERR "%s: unable to get IRQ %d.\n", dev->name, dev->irq); | 994 | printk(KERN_ERR "%s: unable to get IRQ %d.\n", dev->name, dev->irq); |
995 | return -EAGAIN; | 995 | return -EAGAIN; |
996 | } | 996 | } |
diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c index 592de8f1668a..6fbfc8eee632 100644 --- a/drivers/net/eexpress.c +++ b/drivers/net/eexpress.c | |||
@@ -457,7 +457,7 @@ static int eexp_open(struct net_device *dev) | |||
457 | if (!dev->irq || !irqrmap[dev->irq]) | 457 | if (!dev->irq || !irqrmap[dev->irq]) |
458 | return -ENXIO; | 458 | return -ENXIO; |
459 | 459 | ||
460 | ret = request_irq(dev->irq, &eexp_irq, 0, dev->name, dev); | 460 | ret = request_irq(dev->irq, eexp_irq, 0, dev->name, dev); |
461 | if (ret) | 461 | if (ret) |
462 | return ret; | 462 | return ret; |
463 | 463 | ||
diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c index 641a10d2e843..703b4c8e9b4d 100644 --- a/drivers/net/epic100.c +++ b/drivers/net/epic100.c | |||
@@ -668,7 +668,7 @@ static int epic_open(struct net_device *dev) | |||
668 | outl(0x4001, ioaddr + GENCTL); | 668 | outl(0x4001, ioaddr + GENCTL); |
669 | 669 | ||
670 | napi_enable(&ep->napi); | 670 | napi_enable(&ep->napi); |
671 | if ((retval = request_irq(dev->irq, &epic_interrupt, IRQF_SHARED, dev->name, dev))) { | 671 | if ((retval = request_irq(dev->irq, epic_interrupt, IRQF_SHARED, dev->name, dev))) { |
672 | napi_disable(&ep->napi); | 672 | napi_disable(&ep->napi); |
673 | return retval; | 673 | return retval; |
674 | } | 674 | } |
diff --git a/drivers/net/fealnx.c b/drivers/net/fealnx.c index 18d5fbb9673e..e173515790c0 100644 --- a/drivers/net/fealnx.c +++ b/drivers/net/fealnx.c | |||
@@ -839,7 +839,7 @@ static int netdev_open(struct net_device *dev) | |||
839 | 839 | ||
840 | iowrite32(0x00000001, ioaddr + BCR); /* Reset */ | 840 | iowrite32(0x00000001, ioaddr + BCR); /* Reset */ |
841 | 841 | ||
842 | if (request_irq(dev->irq, &intr_handler, IRQF_SHARED, dev->name, dev)) | 842 | if (request_irq(dev->irq, intr_handler, IRQF_SHARED, dev->name, dev)) |
843 | return -EAGAIN; | 843 | return -EAGAIN; |
844 | 844 | ||
845 | for (i = 0; i < 3; i++) | 845 | for (i = 0; i < 3; i++) |
diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c index 66dace6d324f..6407672b28e9 100644 --- a/drivers/net/fec_mpc52xx.c +++ b/drivers/net/fec_mpc52xx.c | |||
@@ -226,17 +226,17 @@ static int mpc52xx_fec_open(struct net_device *dev) | |||
226 | phy_start(priv->phydev); | 226 | phy_start(priv->phydev); |
227 | } | 227 | } |
228 | 228 | ||
229 | if (request_irq(dev->irq, &mpc52xx_fec_interrupt, IRQF_SHARED, | 229 | if (request_irq(dev->irq, mpc52xx_fec_interrupt, IRQF_SHARED, |
230 | DRIVER_NAME "_ctrl", dev)) { | 230 | DRIVER_NAME "_ctrl", dev)) { |
231 | dev_err(&dev->dev, "ctrl interrupt request failed\n"); | 231 | dev_err(&dev->dev, "ctrl interrupt request failed\n"); |
232 | goto free_phy; | 232 | goto free_phy; |
233 | } | 233 | } |
234 | if (request_irq(priv->r_irq, &mpc52xx_fec_rx_interrupt, 0, | 234 | if (request_irq(priv->r_irq, mpc52xx_fec_rx_interrupt, 0, |
235 | DRIVER_NAME "_rx", dev)) { | 235 | DRIVER_NAME "_rx", dev)) { |
236 | dev_err(&dev->dev, "rx interrupt request failed\n"); | 236 | dev_err(&dev->dev, "rx interrupt request failed\n"); |
237 | goto free_ctrl_irq; | 237 | goto free_ctrl_irq; |
238 | } | 238 | } |
239 | if (request_irq(priv->t_irq, &mpc52xx_fec_tx_interrupt, 0, | 239 | if (request_irq(priv->t_irq, mpc52xx_fec_tx_interrupt, 0, |
240 | DRIVER_NAME "_tx", dev)) { | 240 | DRIVER_NAME "_tx", dev)) { |
241 | dev_err(&dev->dev, "tx interrupt request failed\n"); | 241 | dev_err(&dev->dev, "tx interrupt request failed\n"); |
242 | goto free_2irqs; | 242 | goto free_2irqs; |
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index 3116601dbfea..3c340489804a 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c | |||
@@ -4004,7 +4004,7 @@ static int nv_request_irq(struct net_device *dev, int intr_test) | |||
4004 | /* Request irq for rx handling */ | 4004 | /* Request irq for rx handling */ |
4005 | sprintf(np->name_rx, "%s-rx", dev->name); | 4005 | sprintf(np->name_rx, "%s-rx", dev->name); |
4006 | if (request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_RX].vector, | 4006 | if (request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_RX].vector, |
4007 | &nv_nic_irq_rx, IRQF_SHARED, np->name_rx, dev) != 0) { | 4007 | nv_nic_irq_rx, IRQF_SHARED, np->name_rx, dev) != 0) { |
4008 | printk(KERN_INFO "forcedeth: request_irq failed for rx %d\n", ret); | 4008 | printk(KERN_INFO "forcedeth: request_irq failed for rx %d\n", ret); |
4009 | pci_disable_msix(np->pci_dev); | 4009 | pci_disable_msix(np->pci_dev); |
4010 | np->msi_flags &= ~NV_MSI_X_ENABLED; | 4010 | np->msi_flags &= ~NV_MSI_X_ENABLED; |
@@ -4013,7 +4013,7 @@ static int nv_request_irq(struct net_device *dev, int intr_test) | |||
4013 | /* Request irq for tx handling */ | 4013 | /* Request irq for tx handling */ |
4014 | sprintf(np->name_tx, "%s-tx", dev->name); | 4014 | sprintf(np->name_tx, "%s-tx", dev->name); |
4015 | if (request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_TX].vector, | 4015 | if (request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_TX].vector, |
4016 | &nv_nic_irq_tx, IRQF_SHARED, np->name_tx, dev) != 0) { | 4016 | nv_nic_irq_tx, IRQF_SHARED, np->name_tx, dev) != 0) { |
4017 | printk(KERN_INFO "forcedeth: request_irq failed for tx %d\n", ret); | 4017 | printk(KERN_INFO "forcedeth: request_irq failed for tx %d\n", ret); |
4018 | pci_disable_msix(np->pci_dev); | 4018 | pci_disable_msix(np->pci_dev); |
4019 | np->msi_flags &= ~NV_MSI_X_ENABLED; | 4019 | np->msi_flags &= ~NV_MSI_X_ENABLED; |
@@ -4022,7 +4022,7 @@ static int nv_request_irq(struct net_device *dev, int intr_test) | |||
4022 | /* Request irq for link and timer handling */ | 4022 | /* Request irq for link and timer handling */ |
4023 | sprintf(np->name_other, "%s-other", dev->name); | 4023 | sprintf(np->name_other, "%s-other", dev->name); |
4024 | if (request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_OTHER].vector, | 4024 | if (request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_OTHER].vector, |
4025 | &nv_nic_irq_other, IRQF_SHARED, np->name_other, dev) != 0) { | 4025 | nv_nic_irq_other, IRQF_SHARED, np->name_other, dev) != 0) { |
4026 | printk(KERN_INFO "forcedeth: request_irq failed for link %d\n", ret); | 4026 | printk(KERN_INFO "forcedeth: request_irq failed for link %d\n", ret); |
4027 | pci_disable_msix(np->pci_dev); | 4027 | pci_disable_msix(np->pci_dev); |
4028 | np->msi_flags &= ~NV_MSI_X_ENABLED; | 4028 | np->msi_flags &= ~NV_MSI_X_ENABLED; |
diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c index c9ac46118e6f..5d8c6333070e 100644 --- a/drivers/net/hamachi.c +++ b/drivers/net/hamachi.c | |||
@@ -872,7 +872,7 @@ static int hamachi_open(struct net_device *dev) | |||
872 | u32 rx_int_var, tx_int_var; | 872 | u32 rx_int_var, tx_int_var; |
873 | u16 fifo_info; | 873 | u16 fifo_info; |
874 | 874 | ||
875 | i = request_irq(dev->irq, &hamachi_interrupt, IRQF_SHARED, dev->name, dev); | 875 | i = request_irq(dev->irq, hamachi_interrupt, IRQF_SHARED, dev->name, dev); |
876 | if (i) | 876 | if (i) |
877 | return i; | 877 | return i; |
878 | 878 | ||
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c index 5862282ab2fe..a86693906ac8 100644 --- a/drivers/net/ibmveth.c +++ b/drivers/net/ibmveth.c | |||
@@ -625,7 +625,7 @@ static int ibmveth_open(struct net_device *netdev) | |||
625 | } | 625 | } |
626 | 626 | ||
627 | ibmveth_debug_printk("registering irq 0x%x\n", netdev->irq); | 627 | ibmveth_debug_printk("registering irq 0x%x\n", netdev->irq); |
628 | if((rc = request_irq(netdev->irq, &ibmveth_interrupt, 0, netdev->name, netdev)) != 0) { | 628 | if((rc = request_irq(netdev->irq, ibmveth_interrupt, 0, netdev->name, netdev)) != 0) { |
629 | ibmveth_error_printk("unable to request irq 0x%x, rc %d\n", netdev->irq, rc); | 629 | ibmveth_error_printk("unable to request irq 0x%x, rc %d\n", netdev->irq, rc); |
630 | do { | 630 | do { |
631 | rc = h_free_logical_lan(adapter->vdev->unit_address); | 631 | rc = h_free_logical_lan(adapter->vdev->unit_address); |
diff --git a/drivers/net/igb/igb_ethtool.c b/drivers/net/igb/igb_ethtool.c index 88e13f7e566f..2e238bfa1f91 100644 --- a/drivers/net/igb/igb_ethtool.c +++ b/drivers/net/igb/igb_ethtool.c | |||
@@ -1133,21 +1133,21 @@ static int igb_intr_test(struct igb_adapter *adapter, u64 *data) | |||
1133 | /* Hook up test interrupt handler just for this test */ | 1133 | /* Hook up test interrupt handler just for this test */ |
1134 | if (adapter->msix_entries) { | 1134 | if (adapter->msix_entries) { |
1135 | if (request_irq(adapter->msix_entries[0].vector, | 1135 | if (request_irq(adapter->msix_entries[0].vector, |
1136 | &igb_test_intr, 0, netdev->name, adapter)) { | 1136 | igb_test_intr, 0, netdev->name, adapter)) { |
1137 | *data = 1; | 1137 | *data = 1; |
1138 | return -1; | 1138 | return -1; |
1139 | } | 1139 | } |
1140 | } else if (adapter->flags & IGB_FLAG_HAS_MSI) { | 1140 | } else if (adapter->flags & IGB_FLAG_HAS_MSI) { |
1141 | shared_int = false; | 1141 | shared_int = false; |
1142 | if (request_irq(irq, | 1142 | if (request_irq(irq, |
1143 | &igb_test_intr, 0, netdev->name, adapter)) { | 1143 | igb_test_intr, 0, netdev->name, adapter)) { |
1144 | *data = 1; | 1144 | *data = 1; |
1145 | return -1; | 1145 | return -1; |
1146 | } | 1146 | } |
1147 | } else if (!request_irq(irq, &igb_test_intr, IRQF_PROBE_SHARED, | 1147 | } else if (!request_irq(irq, igb_test_intr, IRQF_PROBE_SHARED, |
1148 | netdev->name, adapter)) { | 1148 | netdev->name, adapter)) { |
1149 | shared_int = false; | 1149 | shared_int = false; |
1150 | } else if (request_irq(irq, &igb_test_intr, IRQF_SHARED, | 1150 | } else if (request_irq(irq, igb_test_intr, IRQF_SHARED, |
1151 | netdev->name, adapter)) { | 1151 | netdev->name, adapter)) { |
1152 | *data = 1; | 1152 | *data = 1; |
1153 | return -1; | 1153 | return -1; |
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 0cab5e2b0894..958305e92d67 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c | |||
@@ -525,7 +525,7 @@ static int igb_request_msix(struct igb_adapter *adapter) | |||
525 | int i, err = 0, vector = 0; | 525 | int i, err = 0, vector = 0; |
526 | 526 | ||
527 | err = request_irq(adapter->msix_entries[vector].vector, | 527 | err = request_irq(adapter->msix_entries[vector].vector, |
528 | &igb_msix_other, 0, netdev->name, adapter); | 528 | igb_msix_other, 0, netdev->name, adapter); |
529 | if (err) | 529 | if (err) |
530 | goto out; | 530 | goto out; |
531 | vector++; | 531 | vector++; |
@@ -548,7 +548,7 @@ static int igb_request_msix(struct igb_adapter *adapter) | |||
548 | sprintf(q_vector->name, "%s-unused", netdev->name); | 548 | sprintf(q_vector->name, "%s-unused", netdev->name); |
549 | 549 | ||
550 | err = request_irq(adapter->msix_entries[vector].vector, | 550 | err = request_irq(adapter->msix_entries[vector].vector, |
551 | &igb_msix_ring, 0, q_vector->name, | 551 | igb_msix_ring, 0, q_vector->name, |
552 | q_vector); | 552 | q_vector); |
553 | if (err) | 553 | if (err) |
554 | goto out; | 554 | goto out; |
@@ -875,7 +875,7 @@ static int igb_request_irq(struct igb_adapter *adapter) | |||
875 | } | 875 | } |
876 | 876 | ||
877 | if (adapter->flags & IGB_FLAG_HAS_MSI) { | 877 | if (adapter->flags & IGB_FLAG_HAS_MSI) { |
878 | err = request_irq(adapter->pdev->irq, &igb_intr_msi, 0, | 878 | err = request_irq(adapter->pdev->irq, igb_intr_msi, 0, |
879 | netdev->name, adapter); | 879 | netdev->name, adapter); |
880 | if (!err) | 880 | if (!err) |
881 | goto request_done; | 881 | goto request_done; |
@@ -885,7 +885,7 @@ static int igb_request_irq(struct igb_adapter *adapter) | |||
885 | adapter->flags &= ~IGB_FLAG_HAS_MSI; | 885 | adapter->flags &= ~IGB_FLAG_HAS_MSI; |
886 | } | 886 | } |
887 | 887 | ||
888 | err = request_irq(adapter->pdev->irq, &igb_intr, IRQF_SHARED, | 888 | err = request_irq(adapter->pdev->irq, igb_intr, IRQF_SHARED, |
889 | netdev->name, adapter); | 889 | netdev->name, adapter); |
890 | 890 | ||
891 | if (err) | 891 | if (err) |
diff --git a/drivers/net/igbvf/netdev.c b/drivers/net/igbvf/netdev.c index fad7f348dd1b..e01f44597a26 100644 --- a/drivers/net/igbvf/netdev.c +++ b/drivers/net/igbvf/netdev.c | |||
@@ -1043,7 +1043,7 @@ static int igbvf_request_msix(struct igbvf_adapter *adapter) | |||
1043 | } | 1043 | } |
1044 | 1044 | ||
1045 | err = request_irq(adapter->msix_entries[vector].vector, | 1045 | err = request_irq(adapter->msix_entries[vector].vector, |
1046 | &igbvf_intr_msix_tx, 0, adapter->tx_ring->name, | 1046 | igbvf_intr_msix_tx, 0, adapter->tx_ring->name, |
1047 | netdev); | 1047 | netdev); |
1048 | if (err) | 1048 | if (err) |
1049 | goto out; | 1049 | goto out; |
@@ -1053,7 +1053,7 @@ static int igbvf_request_msix(struct igbvf_adapter *adapter) | |||
1053 | vector++; | 1053 | vector++; |
1054 | 1054 | ||
1055 | err = request_irq(adapter->msix_entries[vector].vector, | 1055 | err = request_irq(adapter->msix_entries[vector].vector, |
1056 | &igbvf_intr_msix_rx, 0, adapter->rx_ring->name, | 1056 | igbvf_intr_msix_rx, 0, adapter->rx_ring->name, |
1057 | netdev); | 1057 | netdev); |
1058 | if (err) | 1058 | if (err) |
1059 | goto out; | 1059 | goto out; |
@@ -1063,7 +1063,7 @@ static int igbvf_request_msix(struct igbvf_adapter *adapter) | |||
1063 | vector++; | 1063 | vector++; |
1064 | 1064 | ||
1065 | err = request_irq(adapter->msix_entries[vector].vector, | 1065 | err = request_irq(adapter->msix_entries[vector].vector, |
1066 | &igbvf_msix_other, 0, netdev->name, netdev); | 1066 | igbvf_msix_other, 0, netdev->name, netdev); |
1067 | if (err) | 1067 | if (err) |
1068 | goto out; | 1068 | goto out; |
1069 | 1069 | ||
diff --git a/drivers/net/irda/au1k_ir.c b/drivers/net/irda/au1k_ir.c index eb424681202d..9b2eebdbb25b 100644 --- a/drivers/net/irda/au1k_ir.c +++ b/drivers/net/irda/au1k_ir.c | |||
@@ -353,13 +353,13 @@ static int au1k_irda_start(struct net_device *dev) | |||
353 | return retval; | 353 | return retval; |
354 | } | 354 | } |
355 | 355 | ||
356 | if ((retval = request_irq(AU1000_IRDA_TX_INT, &au1k_irda_interrupt, | 356 | if ((retval = request_irq(AU1000_IRDA_TX_INT, au1k_irda_interrupt, |
357 | 0, dev->name, dev))) { | 357 | 0, dev->name, dev))) { |
358 | printk(KERN_ERR "%s: unable to get IRQ %d\n", | 358 | printk(KERN_ERR "%s: unable to get IRQ %d\n", |
359 | dev->name, dev->irq); | 359 | dev->name, dev->irq); |
360 | return retval; | 360 | return retval; |
361 | } | 361 | } |
362 | if ((retval = request_irq(AU1000_IRDA_RX_INT, &au1k_irda_interrupt, | 362 | if ((retval = request_irq(AU1000_IRDA_RX_INT, au1k_irda_interrupt, |
363 | 0, dev->name, dev))) { | 363 | 0, dev->name, dev))) { |
364 | free_irq(AU1000_IRDA_TX_INT, dev); | 364 | free_irq(AU1000_IRDA_TX_INT, dev); |
365 | printk(KERN_ERR "%s: unable to get IRQ %d\n", | 365 | printk(KERN_ERR "%s: unable to get IRQ %d\n", |
diff --git a/drivers/net/isa-skeleton.c b/drivers/net/isa-skeleton.c index 9706e64e367b..0e71e2a93160 100644 --- a/drivers/net/isa-skeleton.c +++ b/drivers/net/isa-skeleton.c | |||
@@ -260,7 +260,7 @@ static int __init netcard_probe1(struct net_device *dev, int ioaddr) | |||
260 | dev->irq = 9; | 260 | dev->irq = 9; |
261 | 261 | ||
262 | { | 262 | { |
263 | int irqval = request_irq(dev->irq, &net_interrupt, 0, cardname, dev); | 263 | int irqval = request_irq(dev->irq, net_interrupt, 0, cardname, dev); |
264 | if (irqval) { | 264 | if (irqval) { |
265 | printk("%s: unable to get IRQ %d (irqval=%d).\n", | 265 | printk("%s: unable to get IRQ %d (irqval=%d).\n", |
266 | dev->name, dev->irq, irqval); | 266 | dev->name, dev->irq, irqval); |
@@ -378,7 +378,7 @@ net_open(struct net_device *dev) | |||
378 | * This is used if the interrupt line can turned off (shared). | 378 | * This is used if the interrupt line can turned off (shared). |
379 | * See 3c503.c for an example of selecting the IRQ at config-time. | 379 | * See 3c503.c for an example of selecting the IRQ at config-time. |
380 | */ | 380 | */ |
381 | if (request_irq(dev->irq, &net_interrupt, 0, cardname, dev)) { | 381 | if (request_irq(dev->irq, net_interrupt, 0, cardname, dev)) { |
382 | return -EAGAIN; | 382 | return -EAGAIN; |
383 | } | 383 | } |
384 | /* | 384 | /* |
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c index 1bd0ca1b0465..73646062e8dd 100644 --- a/drivers/net/ixgb/ixgb_main.c +++ b/drivers/net/ixgb/ixgb_main.c | |||
@@ -233,7 +233,7 @@ ixgb_up(struct ixgb_adapter *adapter) | |||
233 | /* proceed to try to request regular interrupt */ | 233 | /* proceed to try to request regular interrupt */ |
234 | } | 234 | } |
235 | 235 | ||
236 | err = request_irq(adapter->pdev->irq, &ixgb_intr, irq_flags, | 236 | err = request_irq(adapter->pdev->irq, ixgb_intr, irq_flags, |
237 | netdev->name, netdev); | 237 | netdev->name, netdev); |
238 | if (err) { | 238 | if (err) { |
239 | if (adapter->have_msi) | 239 | if (adapter->have_msi) |
diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c index 9d2cc833691b..74f04e183545 100644 --- a/drivers/net/ixgbe/ixgbe_ethtool.c +++ b/drivers/net/ixgbe/ixgbe_ethtool.c | |||
@@ -1274,15 +1274,15 @@ static int ixgbe_intr_test(struct ixgbe_adapter *adapter, u64 *data) | |||
1274 | return 0; | 1274 | return 0; |
1275 | } else if (adapter->flags & IXGBE_FLAG_MSI_ENABLED) { | 1275 | } else if (adapter->flags & IXGBE_FLAG_MSI_ENABLED) { |
1276 | shared_int = false; | 1276 | shared_int = false; |
1277 | if (request_irq(irq, &ixgbe_test_intr, 0, netdev->name, | 1277 | if (request_irq(irq, ixgbe_test_intr, 0, netdev->name, |
1278 | netdev)) { | 1278 | netdev)) { |
1279 | *data = 1; | 1279 | *data = 1; |
1280 | return -1; | 1280 | return -1; |
1281 | } | 1281 | } |
1282 | } else if (!request_irq(irq, &ixgbe_test_intr, IRQF_PROBE_SHARED, | 1282 | } else if (!request_irq(irq, ixgbe_test_intr, IRQF_PROBE_SHARED, |
1283 | netdev->name, netdev)) { | 1283 | netdev->name, netdev)) { |
1284 | shared_int = false; | 1284 | shared_int = false; |
1285 | } else if (request_irq(irq, &ixgbe_test_intr, IRQF_SHARED, | 1285 | } else if (request_irq(irq, ixgbe_test_intr, IRQF_SHARED, |
1286 | netdev->name, netdev)) { | 1286 | netdev->name, netdev)) { |
1287 | *data = 1; | 1287 | *data = 1; |
1288 | return -1; | 1288 | return -1; |
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index dceed80f16fb..ebcec30e0783 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c | |||
@@ -1661,7 +1661,7 @@ static int ixgbe_request_msix_irqs(struct ixgbe_adapter *adapter) | |||
1661 | 1661 | ||
1662 | sprintf(adapter->name[vector], "%s:lsc", netdev->name); | 1662 | sprintf(adapter->name[vector], "%s:lsc", netdev->name); |
1663 | err = request_irq(adapter->msix_entries[vector].vector, | 1663 | err = request_irq(adapter->msix_entries[vector].vector, |
1664 | &ixgbe_msix_lsc, 0, adapter->name[vector], netdev); | 1664 | ixgbe_msix_lsc, 0, adapter->name[vector], netdev); |
1665 | if (err) { | 1665 | if (err) { |
1666 | DPRINTK(PROBE, ERR, | 1666 | DPRINTK(PROBE, ERR, |
1667 | "request_irq for msix_lsc failed: %d\n", err); | 1667 | "request_irq for msix_lsc failed: %d\n", err); |
@@ -1832,10 +1832,10 @@ static int ixgbe_request_irq(struct ixgbe_adapter *adapter) | |||
1832 | if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) { | 1832 | if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) { |
1833 | err = ixgbe_request_msix_irqs(adapter); | 1833 | err = ixgbe_request_msix_irqs(adapter); |
1834 | } else if (adapter->flags & IXGBE_FLAG_MSI_ENABLED) { | 1834 | } else if (adapter->flags & IXGBE_FLAG_MSI_ENABLED) { |
1835 | err = request_irq(adapter->pdev->irq, &ixgbe_intr, 0, | 1835 | err = request_irq(adapter->pdev->irq, ixgbe_intr, 0, |
1836 | netdev->name, netdev); | 1836 | netdev->name, netdev); |
1837 | } else { | 1837 | } else { |
1838 | err = request_irq(adapter->pdev->irq, &ixgbe_intr, IRQF_SHARED, | 1838 | err = request_irq(adapter->pdev->irq, ixgbe_intr, IRQF_SHARED, |
1839 | netdev->name, netdev); | 1839 | netdev->name, netdev); |
1840 | } | 1840 | } |
1841 | 1841 | ||
diff --git a/drivers/net/jazzsonic.c b/drivers/net/jazzsonic.c index 6e5b3f30527f..35d5bed450da 100644 --- a/drivers/net/jazzsonic.c +++ b/drivers/net/jazzsonic.c | |||
@@ -81,7 +81,7 @@ static unsigned short known_revisions[] = | |||
81 | 81 | ||
82 | static int jazzsonic_open(struct net_device* dev) | 82 | static int jazzsonic_open(struct net_device* dev) |
83 | { | 83 | { |
84 | if (request_irq(dev->irq, &sonic_interrupt, IRQF_DISABLED, "sonic", dev)) { | 84 | if (request_irq(dev->irq, sonic_interrupt, IRQF_DISABLED, "sonic", dev)) { |
85 | printk(KERN_ERR "%s: unable to get IRQ %d.\n", dev->name, dev->irq); | 85 | printk(KERN_ERR "%s: unable to get IRQ %d.\n", dev->name, dev->irq); |
86 | return -EAGAIN; | 86 | return -EAGAIN; |
87 | } | 87 | } |
diff --git a/drivers/net/korina.c b/drivers/net/korina.c index a07a5972b57e..25e2af6997e4 100644 --- a/drivers/net/korina.c +++ b/drivers/net/korina.c | |||
@@ -1014,14 +1014,14 @@ static int korina_open(struct net_device *dev) | |||
1014 | /* Install the interrupt handler | 1014 | /* Install the interrupt handler |
1015 | * that handles the Done Finished | 1015 | * that handles the Done Finished |
1016 | * Ovr and Und Events */ | 1016 | * Ovr and Und Events */ |
1017 | ret = request_irq(lp->rx_irq, &korina_rx_dma_interrupt, | 1017 | ret = request_irq(lp->rx_irq, korina_rx_dma_interrupt, |
1018 | IRQF_DISABLED, "Korina ethernet Rx", dev); | 1018 | IRQF_DISABLED, "Korina ethernet Rx", dev); |
1019 | if (ret < 0) { | 1019 | if (ret < 0) { |
1020 | printk(KERN_ERR "%s: unable to get Rx DMA IRQ %d\n", | 1020 | printk(KERN_ERR "%s: unable to get Rx DMA IRQ %d\n", |
1021 | dev->name, lp->rx_irq); | 1021 | dev->name, lp->rx_irq); |
1022 | goto err_release; | 1022 | goto err_release; |
1023 | } | 1023 | } |
1024 | ret = request_irq(lp->tx_irq, &korina_tx_dma_interrupt, | 1024 | ret = request_irq(lp->tx_irq, korina_tx_dma_interrupt, |
1025 | IRQF_DISABLED, "Korina ethernet Tx", dev); | 1025 | IRQF_DISABLED, "Korina ethernet Tx", dev); |
1026 | if (ret < 0) { | 1026 | if (ret < 0) { |
1027 | printk(KERN_ERR "%s: unable to get Tx DMA IRQ %d\n", | 1027 | printk(KERN_ERR "%s: unable to get Tx DMA IRQ %d\n", |
@@ -1030,7 +1030,7 @@ static int korina_open(struct net_device *dev) | |||
1030 | } | 1030 | } |
1031 | 1031 | ||
1032 | /* Install handler for overrun error. */ | 1032 | /* Install handler for overrun error. */ |
1033 | ret = request_irq(lp->ovr_irq, &korina_ovr_interrupt, | 1033 | ret = request_irq(lp->ovr_irq, korina_ovr_interrupt, |
1034 | IRQF_DISABLED, "Ethernet Overflow", dev); | 1034 | IRQF_DISABLED, "Ethernet Overflow", dev); |
1035 | if (ret < 0) { | 1035 | if (ret < 0) { |
1036 | printk(KERN_ERR "%s: unable to get OVR IRQ %d\n", | 1036 | printk(KERN_ERR "%s: unable to get OVR IRQ %d\n", |
@@ -1039,7 +1039,7 @@ static int korina_open(struct net_device *dev) | |||
1039 | } | 1039 | } |
1040 | 1040 | ||
1041 | /* Install handler for underflow error. */ | 1041 | /* Install handler for underflow error. */ |
1042 | ret = request_irq(lp->und_irq, &korina_und_interrupt, | 1042 | ret = request_irq(lp->und_irq, korina_und_interrupt, |
1043 | IRQF_DISABLED, "Ethernet Underflow", dev); | 1043 | IRQF_DISABLED, "Ethernet Underflow", dev); |
1044 | if (ret < 0) { | 1044 | if (ret < 0) { |
1045 | printk(KERN_ERR "%s: unable to get UND IRQ %d\n", | 1045 | printk(KERN_ERR "%s: unable to get UND IRQ %d\n", |
diff --git a/drivers/net/lance.c b/drivers/net/lance.c index dcda30338b65..7b2c42992c35 100644 --- a/drivers/net/lance.c +++ b/drivers/net/lance.c | |||
@@ -755,7 +755,7 @@ lance_open(struct net_device *dev) | |||
755 | int i; | 755 | int i; |
756 | 756 | ||
757 | if (dev->irq == 0 || | 757 | if (dev->irq == 0 || |
758 | request_irq(dev->irq, &lance_interrupt, 0, lp->name, dev)) { | 758 | request_irq(dev->irq, lance_interrupt, 0, lp->name, dev)) { |
759 | return -EAGAIN; | 759 | return -EAGAIN; |
760 | } | 760 | } |
761 | 761 | ||
diff --git a/drivers/net/lib82596.c b/drivers/net/lib82596.c index 5b24c67de25e..7a07430206e3 100644 --- a/drivers/net/lib82596.c +++ b/drivers/net/lib82596.c | |||
@@ -588,7 +588,7 @@ static int init_i596_mem(struct net_device *dev) | |||
588 | "%s: i82596 initialization successful\n", | 588 | "%s: i82596 initialization successful\n", |
589 | dev->name)); | 589 | dev->name)); |
590 | 590 | ||
591 | if (request_irq(dev->irq, &i596_interrupt, 0, "i82596", dev)) { | 591 | if (request_irq(dev->irq, i596_interrupt, 0, "i82596", dev)) { |
592 | printk(KERN_ERR "%s: IRQ %d not free\n", dev->name, dev->irq); | 592 | printk(KERN_ERR "%s: IRQ %d not free\n", dev->name, dev->irq); |
593 | goto failed; | 593 | goto failed; |
594 | } | 594 | } |
diff --git a/drivers/net/lp486e.c b/drivers/net/lp486e.c index cc3ed9cf28be..e20fefc73c8b 100644 --- a/drivers/net/lp486e.c +++ b/drivers/net/lp486e.c | |||
@@ -845,7 +845,7 @@ static int i596_open(struct net_device *dev) | |||
845 | { | 845 | { |
846 | int i; | 846 | int i; |
847 | 847 | ||
848 | i = request_irq(dev->irq, &i596_interrupt, IRQF_SHARED, dev->name, dev); | 848 | i = request_irq(dev->irq, i596_interrupt, IRQF_SHARED, dev->name, dev); |
849 | if (i) { | 849 | if (i) { |
850 | printk(KERN_ERR "%s: IRQ %d not free\n", dev->name, dev->irq); | 850 | printk(KERN_ERR "%s: IRQ %d not free\n", dev->name, dev->irq); |
851 | return i; | 851 | return i; |
diff --git a/drivers/net/mac89x0.c b/drivers/net/mac89x0.c index 149e0ed4a055..c244ec34fc43 100644 --- a/drivers/net/mac89x0.c +++ b/drivers/net/mac89x0.c | |||
@@ -337,7 +337,7 @@ net_open(struct net_device *dev) | |||
337 | writereg(dev, PP_BusCTL, readreg(dev, PP_BusCTL) & ~ENABLE_IRQ); | 337 | writereg(dev, PP_BusCTL, readreg(dev, PP_BusCTL) & ~ENABLE_IRQ); |
338 | 338 | ||
339 | /* Grab the interrupt */ | 339 | /* Grab the interrupt */ |
340 | if (request_irq(dev->irq, &net_interrupt, 0, "cs89x0", dev)) | 340 | if (request_irq(dev->irq, net_interrupt, 0, "cs89x0", dev)) |
341 | return -EAGAIN; | 341 | return -EAGAIN; |
342 | 342 | ||
343 | /* Set up the IRQ - Apparently magic */ | 343 | /* Set up the IRQ - Apparently magic */ |
diff --git a/drivers/net/macsonic.c b/drivers/net/macsonic.c index b3d7d8d77f46..875d361fb79d 100644 --- a/drivers/net/macsonic.c +++ b/drivers/net/macsonic.c | |||
@@ -140,7 +140,7 @@ static irqreturn_t macsonic_interrupt(int irq, void *dev_id) | |||
140 | 140 | ||
141 | static int macsonic_open(struct net_device* dev) | 141 | static int macsonic_open(struct net_device* dev) |
142 | { | 142 | { |
143 | if (request_irq(dev->irq, &sonic_interrupt, IRQ_FLG_FAST, "sonic", dev)) { | 143 | if (request_irq(dev->irq, sonic_interrupt, IRQ_FLG_FAST, "sonic", dev)) { |
144 | printk(KERN_ERR "%s: unable to get IRQ %d.\n", dev->name, dev->irq); | 144 | printk(KERN_ERR "%s: unable to get IRQ %d.\n", dev->name, dev->irq); |
145 | return -EAGAIN; | 145 | return -EAGAIN; |
146 | } | 146 | } |
@@ -149,7 +149,7 @@ static int macsonic_open(struct net_device* dev) | |||
149 | * rupt as well, which must prevent re-entrance of the sonic handler. | 149 | * rupt as well, which must prevent re-entrance of the sonic handler. |
150 | */ | 150 | */ |
151 | if (dev->irq == IRQ_AUTO_3) | 151 | if (dev->irq == IRQ_AUTO_3) |
152 | if (request_irq(IRQ_NUBUS_9, &macsonic_interrupt, IRQ_FLG_FAST, "sonic", dev)) { | 152 | if (request_irq(IRQ_NUBUS_9, macsonic_interrupt, IRQ_FLG_FAST, "sonic", dev)) { |
153 | printk(KERN_ERR "%s: unable to get IRQ %d.\n", dev->name, IRQ_NUBUS_9); | 153 | printk(KERN_ERR "%s: unable to get IRQ %d.\n", dev->name, IRQ_NUBUS_9); |
154 | free_irq(dev->irq, dev); | 154 | free_irq(dev->irq, dev); |
155 | return -EAGAIN; | 155 | return -EAGAIN; |
diff --git a/drivers/net/mipsnet.c b/drivers/net/mipsnet.c index 8ea98bd89ff1..8e9704f5c122 100644 --- a/drivers/net/mipsnet.c +++ b/drivers/net/mipsnet.c | |||
@@ -211,7 +211,7 @@ static int mipsnet_open(struct net_device *dev) | |||
211 | { | 211 | { |
212 | int err; | 212 | int err; |
213 | 213 | ||
214 | err = request_irq(dev->irq, &mipsnet_interrupt, | 214 | err = request_irq(dev->irq, mipsnet_interrupt, |
215 | IRQF_SHARED, dev->name, (void *) dev); | 215 | IRQF_SHARED, dev->name, (void *) dev); |
216 | if (err) { | 216 | if (err) { |
217 | release_region(dev->base_addr, sizeof(struct mipsnet_regs)); | 217 | release_region(dev->base_addr, sizeof(struct mipsnet_regs)); |
diff --git a/drivers/net/myri_sbus.c b/drivers/net/myri_sbus.c index 29ebebc6a95b..b3513ad3b703 100644 --- a/drivers/net/myri_sbus.c +++ b/drivers/net/myri_sbus.c | |||
@@ -1084,7 +1084,7 @@ static int __devinit myri_sbus_probe(struct of_device *op, const struct of_devic | |||
1084 | 1084 | ||
1085 | /* Register interrupt handler now. */ | 1085 | /* Register interrupt handler now. */ |
1086 | DET(("Requesting MYRIcom IRQ line.\n")); | 1086 | DET(("Requesting MYRIcom IRQ line.\n")); |
1087 | if (request_irq(dev->irq, &myri_interrupt, | 1087 | if (request_irq(dev->irq, myri_interrupt, |
1088 | IRQF_SHARED, "MyriCOM Ethernet", (void *) dev)) { | 1088 | IRQF_SHARED, "MyriCOM Ethernet", (void *) dev)) { |
1089 | printk("MyriCOM: Cannot register interrupt handler.\n"); | 1089 | printk("MyriCOM: Cannot register interrupt handler.\n"); |
1090 | goto err; | 1090 | goto err; |
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c index b2722c44337e..9a8d3ab4709b 100644 --- a/drivers/net/natsemi.c +++ b/drivers/net/natsemi.c | |||
@@ -1535,7 +1535,7 @@ static int netdev_open(struct net_device *dev) | |||
1535 | /* Reset the chip, just in case. */ | 1535 | /* Reset the chip, just in case. */ |
1536 | natsemi_reset(dev); | 1536 | natsemi_reset(dev); |
1537 | 1537 | ||
1538 | i = request_irq(dev->irq, &intr_handler, IRQF_SHARED, dev->name, dev); | 1538 | i = request_irq(dev->irq, intr_handler, IRQF_SHARED, dev->name, dev); |
1539 | if (i) return i; | 1539 | if (i) return i; |
1540 | 1540 | ||
1541 | if (netif_msg_ifup(np)) | 1541 | if (netif_msg_ifup(np)) |
diff --git a/drivers/net/netx-eth.c b/drivers/net/netx-eth.c index a0d65f592a12..64770298c4f7 100644 --- a/drivers/net/netx-eth.c +++ b/drivers/net/netx-eth.c | |||
@@ -212,7 +212,7 @@ static int netx_eth_open(struct net_device *ndev) | |||
212 | struct netx_eth_priv *priv = netdev_priv(ndev); | 212 | struct netx_eth_priv *priv = netdev_priv(ndev); |
213 | 213 | ||
214 | if (request_irq | 214 | if (request_irq |
215 | (ndev->irq, &netx_eth_interrupt, IRQF_SHARED, ndev->name, ndev)) | 215 | (ndev->irq, netx_eth_interrupt, IRQF_SHARED, ndev->name, ndev)) |
216 | return -EAGAIN; | 216 | return -EAGAIN; |
217 | 217 | ||
218 | writel(ndev->dev_addr[0] | | 218 | writel(ndev->dev_addr[0] | |
diff --git a/drivers/net/ni5010.c b/drivers/net/ni5010.c index 462d20f26436..6a87d810e59d 100644 --- a/drivers/net/ni5010.c +++ b/drivers/net/ni5010.c | |||
@@ -377,7 +377,7 @@ static int ni5010_open(struct net_device *dev) | |||
377 | 377 | ||
378 | PRINTK2((KERN_DEBUG "%s: entering ni5010_open()\n", dev->name)); | 378 | PRINTK2((KERN_DEBUG "%s: entering ni5010_open()\n", dev->name)); |
379 | 379 | ||
380 | if (request_irq(dev->irq, &ni5010_interrupt, 0, boardname, dev)) { | 380 | if (request_irq(dev->irq, ni5010_interrupt, 0, boardname, dev)) { |
381 | printk(KERN_WARNING "%s: Cannot get irq %#2x\n", dev->name, dev->irq); | 381 | printk(KERN_WARNING "%s: Cannot get irq %#2x\n", dev->name, dev->irq); |
382 | return -EAGAIN; | 382 | return -EAGAIN; |
383 | } | 383 | } |
diff --git a/drivers/net/ni52.c b/drivers/net/ni52.c index aad3b370c562..305f4ba36999 100644 --- a/drivers/net/ni52.c +++ b/drivers/net/ni52.c | |||
@@ -284,7 +284,7 @@ static int ni52_open(struct net_device *dev) | |||
284 | startrecv586(dev); | 284 | startrecv586(dev); |
285 | ni_enaint(); | 285 | ni_enaint(); |
286 | 286 | ||
287 | ret = request_irq(dev->irq, &ni52_interrupt, 0, dev->name, dev); | 287 | ret = request_irq(dev->irq, ni52_interrupt, 0, dev->name, dev); |
288 | if (ret) { | 288 | if (ret) { |
289 | ni_reset586(); | 289 | ni_reset586(); |
290 | return ret; | 290 | return ret; |
diff --git a/drivers/net/ni65.c b/drivers/net/ni65.c index 752c2e4d9cf4..ae19aafd2c7e 100644 --- a/drivers/net/ni65.c +++ b/drivers/net/ni65.c | |||
@@ -294,7 +294,7 @@ static void ni65_set_performance(struct priv *p) | |||
294 | static int ni65_open(struct net_device *dev) | 294 | static int ni65_open(struct net_device *dev) |
295 | { | 295 | { |
296 | struct priv *p = dev->ml_priv; | 296 | struct priv *p = dev->ml_priv; |
297 | int irqval = request_irq(dev->irq, &ni65_interrupt,0, | 297 | int irqval = request_irq(dev->irq, ni65_interrupt,0, |
298 | cards[p->cardno].cardname,dev); | 298 | cards[p->cardno].cardname,dev); |
299 | if (irqval) { | 299 | if (irqval) { |
300 | printk(KERN_ERR "%s: unable to get IRQ %d (irqval=%d).\n", | 300 | printk(KERN_ERR "%s: unable to get IRQ %d (irqval=%d).\n", |
diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c index c254a7f5b9f5..1673eb045e1e 100644 --- a/drivers/net/pasemi_mac.c +++ b/drivers/net/pasemi_mac.c | |||
@@ -1216,7 +1216,7 @@ static int pasemi_mac_open(struct net_device *dev) | |||
1216 | snprintf(mac->tx_irq_name, sizeof(mac->tx_irq_name), "%s tx", | 1216 | snprintf(mac->tx_irq_name, sizeof(mac->tx_irq_name), "%s tx", |
1217 | dev->name); | 1217 | dev->name); |
1218 | 1218 | ||
1219 | ret = request_irq(mac->tx->chan.irq, &pasemi_mac_tx_intr, IRQF_DISABLED, | 1219 | ret = request_irq(mac->tx->chan.irq, pasemi_mac_tx_intr, IRQF_DISABLED, |
1220 | mac->tx_irq_name, mac->tx); | 1220 | mac->tx_irq_name, mac->tx); |
1221 | if (ret) { | 1221 | if (ret) { |
1222 | dev_err(&mac->pdev->dev, "request_irq of irq %d failed: %d\n", | 1222 | dev_err(&mac->pdev->dev, "request_irq of irq %d failed: %d\n", |
@@ -1227,7 +1227,7 @@ static int pasemi_mac_open(struct net_device *dev) | |||
1227 | snprintf(mac->rx_irq_name, sizeof(mac->rx_irq_name), "%s rx", | 1227 | snprintf(mac->rx_irq_name, sizeof(mac->rx_irq_name), "%s rx", |
1228 | dev->name); | 1228 | dev->name); |
1229 | 1229 | ||
1230 | ret = request_irq(mac->rx->chan.irq, &pasemi_mac_rx_intr, IRQF_DISABLED, | 1230 | ret = request_irq(mac->rx->chan.irq, pasemi_mac_rx_intr, IRQF_DISABLED, |
1231 | mac->rx_irq_name, mac->rx); | 1231 | mac->rx_irq_name, mac->rx); |
1232 | if (ret) { | 1232 | if (ret) { |
1233 | dev_err(&mac->pdev->dev, "request_irq of irq %d failed: %d\n", | 1233 | dev_err(&mac->pdev->dev, "request_irq of irq %d failed: %d\n", |
diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c index c1b3f09f452c..076f23a10517 100644 --- a/drivers/net/pcnet32.c +++ b/drivers/net/pcnet32.c | |||
@@ -2095,7 +2095,7 @@ static int pcnet32_open(struct net_device *dev) | |||
2095 | int rc; | 2095 | int rc; |
2096 | unsigned long flags; | 2096 | unsigned long flags; |
2097 | 2097 | ||
2098 | if (request_irq(dev->irq, &pcnet32_interrupt, | 2098 | if (request_irq(dev->irq, pcnet32_interrupt, |
2099 | lp->shared_irq ? IRQF_SHARED : 0, dev->name, | 2099 | lp->shared_irq ? IRQF_SHARED : 0, dev->name, |
2100 | (void *)dev)) { | 2100 | (void *)dev)) { |
2101 | return -EAGAIN; | 2101 | return -EAGAIN; |
diff --git a/drivers/net/s6gmac.c b/drivers/net/s6gmac.c index 4525cbe8dd69..d81706e91aa7 100644 --- a/drivers/net/s6gmac.c +++ b/drivers/net/s6gmac.c | |||
@@ -984,7 +984,7 @@ static int __devinit s6gmac_probe(struct platform_device *pdev) | |||
984 | pd->rx_dma = DMA_MASK_DMAC(i); | 984 | pd->rx_dma = DMA_MASK_DMAC(i); |
985 | pd->rx_chan = DMA_INDEX_CHNL(i); | 985 | pd->rx_chan = DMA_INDEX_CHNL(i); |
986 | pd->io = platform_get_resource(pdev, IORESOURCE_IO, 0)->start; | 986 | pd->io = platform_get_resource(pdev, IORESOURCE_IO, 0)->start; |
987 | res = request_irq(dev->irq, &s6gmac_interrupt, 0, dev->name, dev); | 987 | res = request_irq(dev->irq, s6gmac_interrupt, 0, dev->name, dev); |
988 | if (res) { | 988 | if (res) { |
989 | printk(KERN_ERR DRV_PRMT "irq request failed: %d\n", dev->irq); | 989 | printk(KERN_ERR DRV_PRMT "irq request failed: %d\n", dev->irq); |
990 | goto errirq; | 990 | goto errirq; |
diff --git a/drivers/net/sb1000.c b/drivers/net/sb1000.c index c9c70ab0cce0..9f83a1197375 100644 --- a/drivers/net/sb1000.c +++ b/drivers/net/sb1000.c | |||
@@ -973,7 +973,7 @@ sb1000_open(struct net_device *dev) | |||
973 | lp->rx_frame_id[1] = 0; | 973 | lp->rx_frame_id[1] = 0; |
974 | lp->rx_frame_id[2] = 0; | 974 | lp->rx_frame_id[2] = 0; |
975 | lp->rx_frame_id[3] = 0; | 975 | lp->rx_frame_id[3] = 0; |
976 | if (request_irq(dev->irq, &sb1000_interrupt, 0, "sb1000", dev)) { | 976 | if (request_irq(dev->irq, sb1000_interrupt, 0, "sb1000", dev)) { |
977 | return -EAGAIN; | 977 | return -EAGAIN; |
978 | } | 978 | } |
979 | 979 | ||
diff --git a/drivers/net/sb1250-mac.c b/drivers/net/sb1250-mac.c index 7269a875326e..564d4d7f855b 100644 --- a/drivers/net/sb1250-mac.c +++ b/drivers/net/sb1250-mac.c | |||
@@ -2410,7 +2410,7 @@ static int sbmac_open(struct net_device *dev) | |||
2410 | */ | 2410 | */ |
2411 | 2411 | ||
2412 | __raw_readq(sc->sbm_isr); | 2412 | __raw_readq(sc->sbm_isr); |
2413 | err = request_irq(dev->irq, &sbmac_intr, IRQF_SHARED, dev->name, dev); | 2413 | err = request_irq(dev->irq, sbmac_intr, IRQF_SHARED, dev->name, dev); |
2414 | if (err) { | 2414 | if (err) { |
2415 | printk(KERN_ERR "%s: unable to get IRQ %d\n", dev->name, | 2415 | printk(KERN_ERR "%s: unable to get IRQ %d\n", dev->name, |
2416 | dev->irq); | 2416 | dev->irq); |
diff --git a/drivers/net/seeq8005.c b/drivers/net/seeq8005.c index 39246d457ac2..fe806bd9b95f 100644 --- a/drivers/net/seeq8005.c +++ b/drivers/net/seeq8005.c | |||
@@ -335,7 +335,7 @@ static int __init seeq8005_probe1(struct net_device *dev, int ioaddr) | |||
335 | 335 | ||
336 | #if 0 | 336 | #if 0 |
337 | { | 337 | { |
338 | int irqval = request_irq(dev->irq, &seeq8005_interrupt, 0, "seeq8005", dev); | 338 | int irqval = request_irq(dev->irq, seeq8005_interrupt, 0, "seeq8005", dev); |
339 | if (irqval) { | 339 | if (irqval) { |
340 | printk ("%s: unable to get IRQ %d (irqval=%d).\n", dev->name, | 340 | printk ("%s: unable to get IRQ %d (irqval=%d).\n", dev->name, |
341 | dev->irq, irqval); | 341 | dev->irq, irqval); |
@@ -367,7 +367,7 @@ static int seeq8005_open(struct net_device *dev) | |||
367 | struct net_local *lp = netdev_priv(dev); | 367 | struct net_local *lp = netdev_priv(dev); |
368 | 368 | ||
369 | { | 369 | { |
370 | int irqval = request_irq(dev->irq, &seeq8005_interrupt, 0, "seeq8005", dev); | 370 | int irqval = request_irq(dev->irq, seeq8005_interrupt, 0, "seeq8005", dev); |
371 | if (irqval) { | 371 | if (irqval) { |
372 | printk ("%s: unable to get IRQ %d (irqval=%d).\n", dev->name, | 372 | printk ("%s: unable to get IRQ %d (irqval=%d).\n", dev->name, |
373 | dev->irq, irqval); | 373 | dev->irq, irqval); |
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index 5783f50d18e9..c88bc1013047 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c | |||
@@ -1016,7 +1016,7 @@ static int sh_eth_open(struct net_device *ndev) | |||
1016 | 1016 | ||
1017 | pm_runtime_get_sync(&mdp->pdev->dev); | 1017 | pm_runtime_get_sync(&mdp->pdev->dev); |
1018 | 1018 | ||
1019 | ret = request_irq(ndev->irq, &sh_eth_interrupt, | 1019 | ret = request_irq(ndev->irq, sh_eth_interrupt, |
1020 | #if defined(CONFIG_CPU_SUBTYPE_SH7763) || defined(CONFIG_CPU_SUBTYPE_SH7764) | 1020 | #if defined(CONFIG_CPU_SUBTYPE_SH7763) || defined(CONFIG_CPU_SUBTYPE_SH7764) |
1021 | IRQF_SHARED, | 1021 | IRQF_SHARED, |
1022 | #else | 1022 | #else |
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c index c072f7f36acf..9a12d88ac2d9 100644 --- a/drivers/net/sis900.c +++ b/drivers/net/sis900.c | |||
@@ -1016,7 +1016,7 @@ sis900_open(struct net_device *net_dev) | |||
1016 | /* Equalizer workaround Rule */ | 1016 | /* Equalizer workaround Rule */ |
1017 | sis630_set_eq(net_dev, sis_priv->chipset_rev); | 1017 | sis630_set_eq(net_dev, sis_priv->chipset_rev); |
1018 | 1018 | ||
1019 | ret = request_irq(net_dev->irq, &sis900_interrupt, IRQF_SHARED, | 1019 | ret = request_irq(net_dev->irq, sis900_interrupt, IRQF_SHARED, |
1020 | net_dev->name, net_dev); | 1020 | net_dev->name, net_dev); |
1021 | if (ret) | 1021 | if (ret) |
1022 | return ret; | 1022 | return ret; |
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index 2a6b6de95339..44ebbaa7457b 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c | |||
@@ -1984,7 +1984,7 @@ static int __devinit smc911x_probe(struct net_device *dev) | |||
1984 | #endif | 1984 | #endif |
1985 | 1985 | ||
1986 | /* Grab the IRQ */ | 1986 | /* Grab the IRQ */ |
1987 | retval = request_irq(dev->irq, &smc911x_interrupt, | 1987 | retval = request_irq(dev->irq, smc911x_interrupt, |
1988 | irq_flags, dev->name, dev); | 1988 | irq_flags, dev->name, dev); |
1989 | if (retval) | 1989 | if (retval) |
1990 | goto err_out; | 1990 | goto err_out; |
diff --git a/drivers/net/smc9194.c b/drivers/net/smc9194.c index 934a12012829..8371b82323ac 100644 --- a/drivers/net/smc9194.c +++ b/drivers/net/smc9194.c | |||
@@ -1050,7 +1050,7 @@ static int __init smc_probe(struct net_device *dev, int ioaddr) | |||
1050 | memset(netdev_priv(dev), 0, sizeof(struct smc_local)); | 1050 | memset(netdev_priv(dev), 0, sizeof(struct smc_local)); |
1051 | 1051 | ||
1052 | /* Grab the IRQ */ | 1052 | /* Grab the IRQ */ |
1053 | retval = request_irq(dev->irq, &smc_interrupt, 0, DRV_NAME, dev); | 1053 | retval = request_irq(dev->irq, smc_interrupt, 0, DRV_NAME, dev); |
1054 | if (retval) { | 1054 | if (retval) { |
1055 | printk("%s: unable to get IRQ %d (irqval=%d).\n", DRV_NAME, | 1055 | printk("%s: unable to get IRQ %d (irqval=%d).\n", DRV_NAME, |
1056 | dev->irq, retval); | 1056 | dev->irq, retval); |
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c index 05c91ee6921e..0b56ab468d28 100644 --- a/drivers/net/smc91x.c +++ b/drivers/net/smc91x.c | |||
@@ -2031,7 +2031,7 @@ static int __devinit smc_probe(struct net_device *dev, void __iomem *ioaddr, | |||
2031 | } | 2031 | } |
2032 | 2032 | ||
2033 | /* Grab the IRQ */ | 2033 | /* Grab the IRQ */ |
2034 | retval = request_irq(dev->irq, &smc_interrupt, irq_flags, dev->name, dev); | 2034 | retval = request_irq(dev->irq, smc_interrupt, irq_flags, dev->name, dev); |
2035 | if (retval) | 2035 | if (retval) |
2036 | goto err_out; | 2036 | goto err_out; |
2037 | 2037 | ||
diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c index a36e2b51e88c..aa10158adb9e 100644 --- a/drivers/net/starfire.c +++ b/drivers/net/starfire.c | |||
@@ -928,7 +928,7 @@ static int netdev_open(struct net_device *dev) | |||
928 | 928 | ||
929 | /* Do we ever need to reset the chip??? */ | 929 | /* Do we ever need to reset the chip??? */ |
930 | 930 | ||
931 | retval = request_irq(dev->irq, &intr_handler, IRQF_SHARED, dev->name, dev); | 931 | retval = request_irq(dev->irq, intr_handler, IRQF_SHARED, dev->name, dev); |
932 | if (retval) | 932 | if (retval) |
933 | return retval; | 933 | return retval; |
934 | 934 | ||
diff --git a/drivers/net/stmmac/stmmac_main.c b/drivers/net/stmmac/stmmac_main.c index c2f14dc9ba28..e961e7593c1f 100644 --- a/drivers/net/stmmac/stmmac_main.c +++ b/drivers/net/stmmac/stmmac_main.c | |||
@@ -1022,7 +1022,7 @@ static int stmmac_open(struct net_device *dev) | |||
1022 | } | 1022 | } |
1023 | 1023 | ||
1024 | /* Request the IRQ lines */ | 1024 | /* Request the IRQ lines */ |
1025 | ret = request_irq(dev->irq, &stmmac_interrupt, | 1025 | ret = request_irq(dev->irq, stmmac_interrupt, |
1026 | IRQF_SHARED, dev->name, dev); | 1026 | IRQF_SHARED, dev->name, dev); |
1027 | if (unlikely(ret < 0)) { | 1027 | if (unlikely(ret < 0)) { |
1028 | pr_err("%s: ERROR: allocating the IRQ %d (error: %d)\n", | 1028 | pr_err("%s: ERROR: allocating the IRQ %d (error: %d)\n", |
diff --git a/drivers/net/sun3_82586.c b/drivers/net/sun3_82586.c index 2f1eaaf7a727..b447a8719427 100644 --- a/drivers/net/sun3_82586.c +++ b/drivers/net/sun3_82586.c | |||
@@ -191,7 +191,7 @@ static int sun3_82586_open(struct net_device *dev) | |||
191 | startrecv586(dev); | 191 | startrecv586(dev); |
192 | sun3_enaint(); | 192 | sun3_enaint(); |
193 | 193 | ||
194 | ret = request_irq(dev->irq, &sun3_82586_interrupt,0,dev->name,dev); | 194 | ret = request_irq(dev->irq, sun3_82586_interrupt,0,dev->name,dev); |
195 | if (ret) | 195 | if (ret) |
196 | { | 196 | { |
197 | sun3_reset586(); | 197 | sun3_reset586(); |
diff --git a/drivers/net/sunbmac.c b/drivers/net/sunbmac.c index 536cf7e06bfd..25e81ebd9cd8 100644 --- a/drivers/net/sunbmac.c +++ b/drivers/net/sunbmac.c | |||
@@ -919,7 +919,7 @@ static int bigmac_open(struct net_device *dev) | |||
919 | struct bigmac *bp = netdev_priv(dev); | 919 | struct bigmac *bp = netdev_priv(dev); |
920 | int ret; | 920 | int ret; |
921 | 921 | ||
922 | ret = request_irq(dev->irq, &bigmac_interrupt, IRQF_SHARED, dev->name, bp); | 922 | ret = request_irq(dev->irq, bigmac_interrupt, IRQF_SHARED, dev->name, bp); |
923 | if (ret) { | 923 | if (ret) { |
924 | printk(KERN_ERR "BIGMAC: Can't order irq %d to go.\n", dev->irq); | 924 | printk(KERN_ERR "BIGMAC: Can't order irq %d to go.\n", dev->irq); |
925 | return ret; | 925 | return ret; |
diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c index e13685a570f4..5c396c2e6e76 100644 --- a/drivers/net/sundance.c +++ b/drivers/net/sundance.c | |||
@@ -819,7 +819,7 @@ static int netdev_open(struct net_device *dev) | |||
819 | 819 | ||
820 | /* Do we need to reset the chip??? */ | 820 | /* Do we need to reset the chip??? */ |
821 | 821 | ||
822 | i = request_irq(dev->irq, &intr_handler, IRQF_SHARED, dev->name, dev); | 822 | i = request_irq(dev->irq, intr_handler, IRQF_SHARED, dev->name, dev); |
823 | if (i) | 823 | if (i) |
824 | return i; | 824 | return i; |
825 | 825 | ||
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c index 37d721bbdb35..1f842a78acd1 100644 --- a/drivers/net/sunhme.c +++ b/drivers/net/sunhme.c | |||
@@ -2184,7 +2184,7 @@ static int happy_meal_open(struct net_device *dev) | |||
2184 | * into a single source which we register handling at probe time. | 2184 | * into a single source which we register handling at probe time. |
2185 | */ | 2185 | */ |
2186 | if ((hp->happy_flags & (HFLAG_QUATTRO|HFLAG_PCI)) != HFLAG_QUATTRO) { | 2186 | if ((hp->happy_flags & (HFLAG_QUATTRO|HFLAG_PCI)) != HFLAG_QUATTRO) { |
2187 | if (request_irq(dev->irq, &happy_meal_interrupt, | 2187 | if (request_irq(dev->irq, happy_meal_interrupt, |
2188 | IRQF_SHARED, dev->name, (void *)dev)) { | 2188 | IRQF_SHARED, dev->name, (void *)dev)) { |
2189 | HMD(("EAGAIN\n")); | 2189 | HMD(("EAGAIN\n")); |
2190 | printk(KERN_ERR "happy_meal(SBUS): Can't order irq %d to go.\n", | 2190 | printk(KERN_ERR "happy_meal(SBUS): Can't order irq %d to go.\n", |
diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c index 9d6fd4760eab..64e7d08c878f 100644 --- a/drivers/net/sunlance.c +++ b/drivers/net/sunlance.c | |||
@@ -923,7 +923,7 @@ static int lance_open(struct net_device *dev) | |||
923 | 923 | ||
924 | STOP_LANCE(lp); | 924 | STOP_LANCE(lp); |
925 | 925 | ||
926 | if (request_irq(dev->irq, &lance_interrupt, IRQF_SHARED, | 926 | if (request_irq(dev->irq, lance_interrupt, IRQF_SHARED, |
927 | lancestr, (void *) dev)) { | 927 | lancestr, (void *) dev)) { |
928 | printk(KERN_ERR "Lance: Can't get irq %d\n", dev->irq); | 928 | printk(KERN_ERR "Lance: Can't get irq %d\n", dev->irq); |
929 | return -EAGAIN; | 929 | return -EAGAIN; |
diff --git a/drivers/net/sunqe.c b/drivers/net/sunqe.c index dcefb608a9f4..45c383f285ee 100644 --- a/drivers/net/sunqe.c +++ b/drivers/net/sunqe.c | |||
@@ -807,7 +807,7 @@ static struct sunqec * __devinit get_qec(struct of_device *child) | |||
807 | 807 | ||
808 | qec_init_once(qecp, op); | 808 | qec_init_once(qecp, op); |
809 | 809 | ||
810 | if (request_irq(op->irqs[0], &qec_interrupt, | 810 | if (request_irq(op->irqs[0], qec_interrupt, |
811 | IRQF_SHARED, "qec", (void *) qecp)) { | 811 | IRQF_SHARED, "qec", (void *) qecp)) { |
812 | printk(KERN_ERR "qec: Can't register irq.\n"); | 812 | printk(KERN_ERR "qec: Can't register irq.\n"); |
813 | goto fail; | 813 | goto fail; |
diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c index 6572e8a54520..75a669d48e5e 100644 --- a/drivers/net/tc35815.c +++ b/drivers/net/tc35815.c | |||
@@ -1248,7 +1248,7 @@ tc35815_open(struct net_device *dev) | |||
1248 | * This is used if the interrupt line can turned off (shared). | 1248 | * This is used if the interrupt line can turned off (shared). |
1249 | * See 3c503.c for an example of selecting the IRQ at config-time. | 1249 | * See 3c503.c for an example of selecting the IRQ at config-time. |
1250 | */ | 1250 | */ |
1251 | if (request_irq(dev->irq, &tc35815_interrupt, IRQF_SHARED, | 1251 | if (request_irq(dev->irq, tc35815_interrupt, IRQF_SHARED, |
1252 | dev->name, dev)) | 1252 | dev->name, dev)) |
1253 | return -EAGAIN; | 1253 | return -EAGAIN; |
1254 | 1254 | ||
diff --git a/drivers/net/tehuti.c b/drivers/net/tehuti.c index 492bff68bf2d..2fbac31767fa 100644 --- a/drivers/net/tehuti.c +++ b/drivers/net/tehuti.c | |||
@@ -420,7 +420,7 @@ static int bdx_hw_start(struct bdx_priv *priv) | |||
420 | GMAC_RX_FILTER_AM | GMAC_RX_FILTER_AB); | 420 | GMAC_RX_FILTER_AM | GMAC_RX_FILTER_AB); |
421 | 421 | ||
422 | #define BDX_IRQ_TYPE ((priv->nic->irq_type == IRQ_MSI)?0:IRQF_SHARED) | 422 | #define BDX_IRQ_TYPE ((priv->nic->irq_type == IRQ_MSI)?0:IRQF_SHARED) |
423 | if ((rc = request_irq(priv->pdev->irq, &bdx_isr_napi, BDX_IRQ_TYPE, | 423 | if ((rc = request_irq(priv->pdev->irq, bdx_isr_napi, BDX_IRQ_TYPE, |
424 | ndev->name, ndev))) | 424 | ndev->name, ndev))) |
425 | goto err_irq; | 425 | goto err_irq; |
426 | bdx_enable_interrupts(priv); | 426 | bdx_enable_interrupts(priv); |
diff --git a/drivers/net/tokenring/ibmtr.c b/drivers/net/tokenring/ibmtr.c index 75fa32e34fd0..5db0270957ac 100644 --- a/drivers/net/tokenring/ibmtr.c +++ b/drivers/net/tokenring/ibmtr.c | |||
@@ -680,7 +680,7 @@ static int __devinit ibmtr_probe1(struct net_device *dev, int PIOaddr) | |||
680 | 680 | ||
681 | /* The PCMCIA has already got the interrupt line and the io port, | 681 | /* The PCMCIA has already got the interrupt line and the io port, |
682 | so no chance of anybody else getting it - MLP */ | 682 | so no chance of anybody else getting it - MLP */ |
683 | if (request_irq(dev->irq = irq, &tok_interrupt, 0, "ibmtr", dev) != 0) { | 683 | if (request_irq(dev->irq = irq, tok_interrupt, 0, "ibmtr", dev) != 0) { |
684 | DPRINTK("Could not grab irq %d. Halting Token Ring driver.\n", | 684 | DPRINTK("Could not grab irq %d. Halting Token Ring driver.\n", |
685 | irq); | 685 | irq); |
686 | iounmap(t_mmio); | 686 | iounmap(t_mmio); |
diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c index 26dca2b2bdbd..7b1fe9412b6f 100644 --- a/drivers/net/tokenring/lanstreamer.c +++ b/drivers/net/tokenring/lanstreamer.c | |||
@@ -596,7 +596,7 @@ static int streamer_open(struct net_device *dev) | |||
596 | rc=streamer_reset(dev); | 596 | rc=streamer_reset(dev); |
597 | } | 597 | } |
598 | 598 | ||
599 | if (request_irq(dev->irq, &streamer_interrupt, IRQF_SHARED, "lanstreamer", dev)) { | 599 | if (request_irq(dev->irq, streamer_interrupt, IRQF_SHARED, "lanstreamer", dev)) { |
600 | return -EAGAIN; | 600 | return -EAGAIN; |
601 | } | 601 | } |
602 | #if STREAMER_DEBUG | 602 | #if STREAMER_DEBUG |
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; |
diff --git a/drivers/net/wan/hostess_sv11.c b/drivers/net/wan/hostess_sv11.c index 15002c3d0d95..74164d29524c 100644 --- a/drivers/net/wan/hostess_sv11.c +++ b/drivers/net/wan/hostess_sv11.c | |||
@@ -218,7 +218,7 @@ static struct z8530_dev *sv11_init(int iobase, int irq) | |||
218 | /* We want a fast IRQ for this device. Actually we'd like an even faster | 218 | /* We want a fast IRQ for this device. Actually we'd like an even faster |
219 | IRQ ;) - This is one driver RtLinux is made for */ | 219 | IRQ ;) - This is one driver RtLinux is made for */ |
220 | 220 | ||
221 | if (request_irq(irq, &z8530_interrupt, IRQF_DISABLED, | 221 | if (request_irq(irq, z8530_interrupt, IRQF_DISABLED, |
222 | "Hostess SV11", sv) < 0) { | 222 | "Hostess SV11", sv) < 0) { |
223 | printk(KERN_WARNING "hostess: IRQ %d already in use.\n", irq); | 223 | printk(KERN_WARNING "hostess: IRQ %d already in use.\n", irq); |
224 | goto err_irq; | 224 | goto err_irq; |
diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c index 7ea71b33d2e9..2ebe935d1058 100644 --- a/drivers/net/wan/lmc/lmc_main.c +++ b/drivers/net/wan/lmc/lmc_main.c | |||
@@ -1028,7 +1028,7 @@ static int lmc_open(struct net_device *dev) | |||
1028 | lmc_softreset (sc); | 1028 | lmc_softreset (sc); |
1029 | 1029 | ||
1030 | /* Since we have to use PCI bus, this should work on x86,alpha,ppc */ | 1030 | /* Since we have to use PCI bus, this should work on x86,alpha,ppc */ |
1031 | if (request_irq (dev->irq, &lmc_interrupt, IRQF_SHARED, dev->name, dev)){ | 1031 | if (request_irq (dev->irq, lmc_interrupt, IRQF_SHARED, dev->name, dev)){ |
1032 | printk(KERN_WARNING "%s: could not get irq: %d\n", dev->name, dev->irq); | 1032 | printk(KERN_WARNING "%s: could not get irq: %d\n", dev->name, dev->irq); |
1033 | lmc_trace(dev, "lmc_open irq failed out"); | 1033 | lmc_trace(dev, "lmc_open irq failed out"); |
1034 | return -EAGAIN; | 1034 | return -EAGAIN; |
diff --git a/drivers/net/wan/n2.c b/drivers/net/wan/n2.c index 58c66819f39b..5394b51bdb2f 100644 --- a/drivers/net/wan/n2.c +++ b/drivers/net/wan/n2.c | |||
@@ -376,7 +376,7 @@ static int __init n2_run(unsigned long io, unsigned long irq, | |||
376 | } | 376 | } |
377 | card->io = io; | 377 | card->io = io; |
378 | 378 | ||
379 | if (request_irq(irq, &sca_intr, 0, devname, card)) { | 379 | if (request_irq(irq, sca_intr, 0, devname, card)) { |
380 | printk(KERN_ERR "n2: could not allocate IRQ\n"); | 380 | printk(KERN_ERR "n2: could not allocate IRQ\n"); |
381 | n2_destroy_card(card); | 381 | n2_destroy_card(card); |
382 | return(-EBUSY); | 382 | return(-EBUSY); |
diff --git a/drivers/net/wan/sdla.c b/drivers/net/wan/sdla.c index 2b15a7e40d5b..31c41af2246d 100644 --- a/drivers/net/wan/sdla.c +++ b/drivers/net/wan/sdla.c | |||
@@ -1457,7 +1457,7 @@ got_type: | |||
1457 | } | 1457 | } |
1458 | 1458 | ||
1459 | err = -EAGAIN; | 1459 | err = -EAGAIN; |
1460 | if (request_irq(dev->irq, &sdla_isr, 0, dev->name, dev)) | 1460 | if (request_irq(dev->irq, sdla_isr, 0, dev->name, dev)) |
1461 | goto fail; | 1461 | goto fail; |
1462 | 1462 | ||
1463 | if (flp->type == SDLA_S507) { | 1463 | if (flp->type == SDLA_S507) { |
diff --git a/drivers/net/wan/sealevel.c b/drivers/net/wan/sealevel.c index 0c525e24b247..3b3ee05bc462 100644 --- a/drivers/net/wan/sealevel.c +++ b/drivers/net/wan/sealevel.c | |||
@@ -266,7 +266,7 @@ static __init struct slvl_board *slvl_init(int iobase, int irq, | |||
266 | /* We want a fast IRQ for this device. Actually we'd like an even faster | 266 | /* We want a fast IRQ for this device. Actually we'd like an even faster |
267 | IRQ ;) - This is one driver RtLinux is made for */ | 267 | IRQ ;) - This is one driver RtLinux is made for */ |
268 | 268 | ||
269 | if (request_irq(irq, &z8530_interrupt, IRQF_DISABLED, | 269 | if (request_irq(irq, z8530_interrupt, IRQF_DISABLED, |
270 | "SeaLevel", dev) < 0) { | 270 | "SeaLevel", dev) < 0) { |
271 | printk(KERN_WARNING "sealevel: IRQ %d already in use.\n", irq); | 271 | printk(KERN_WARNING "sealevel: IRQ %d already in use.\n", irq); |
272 | goto err_request_irq; | 272 | goto err_request_irq; |
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c index 9e64dd43a3be..0cb5ecc822a8 100644 --- a/drivers/net/wireless/mwl8k.c +++ b/drivers/net/wireless/mwl8k.c | |||
@@ -2817,7 +2817,7 @@ static int mwl8k_start(struct ieee80211_hw *hw) | |||
2817 | struct mwl8k_priv *priv = hw->priv; | 2817 | struct mwl8k_priv *priv = hw->priv; |
2818 | int rc; | 2818 | int rc; |
2819 | 2819 | ||
2820 | rc = request_irq(priv->pdev->irq, &mwl8k_interrupt, | 2820 | rc = request_irq(priv->pdev->irq, mwl8k_interrupt, |
2821 | IRQF_SHARED, MWL8K_NAME, hw); | 2821 | IRQF_SHARED, MWL8K_NAME, hw); |
2822 | if (rc) { | 2822 | if (rc) { |
2823 | printk(KERN_ERR "%s: failed to register IRQ handler\n", | 2823 | printk(KERN_ERR "%s: failed to register IRQ handler\n", |
@@ -3482,7 +3482,7 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev, | |||
3482 | iowrite32(0, priv->regs + MWL8K_HIU_A2H_INTERRUPT_CLEAR_SEL); | 3482 | iowrite32(0, priv->regs + MWL8K_HIU_A2H_INTERRUPT_CLEAR_SEL); |
3483 | iowrite32(0xffffffff, priv->regs + MWL8K_HIU_A2H_INTERRUPT_STATUS_MASK); | 3483 | iowrite32(0xffffffff, priv->regs + MWL8K_HIU_A2H_INTERRUPT_STATUS_MASK); |
3484 | 3484 | ||
3485 | rc = request_irq(priv->pdev->irq, &mwl8k_interrupt, | 3485 | rc = request_irq(priv->pdev->irq, mwl8k_interrupt, |
3486 | IRQF_SHARED, MWL8K_NAME, hw); | 3486 | IRQF_SHARED, MWL8K_NAME, hw); |
3487 | if (rc) { | 3487 | if (rc) { |
3488 | printk(KERN_ERR "%s: failed to register IRQ handler\n", | 3488 | printk(KERN_ERR "%s: failed to register IRQ handler\n", |
diff --git a/drivers/net/wireless/prism54/islpci_hotplug.c b/drivers/net/wireless/prism54/islpci_hotplug.c index 83d366258c81..e4f2bb7368f2 100644 --- a/drivers/net/wireless/prism54/islpci_hotplug.c +++ b/drivers/net/wireless/prism54/islpci_hotplug.c | |||
@@ -181,7 +181,7 @@ prism54_probe(struct pci_dev *pdev, const struct pci_device_id *id) | |||
181 | isl38xx_disable_interrupts(priv->device_base); | 181 | isl38xx_disable_interrupts(priv->device_base); |
182 | 182 | ||
183 | /* request for the interrupt before uploading the firmware */ | 183 | /* request for the interrupt before uploading the firmware */ |
184 | rvalue = request_irq(pdev->irq, &islpci_interrupt, | 184 | rvalue = request_irq(pdev->irq, islpci_interrupt, |
185 | IRQF_SHARED, ndev->name, priv); | 185 | IRQF_SHARED, ndev->name, priv); |
186 | 186 | ||
187 | if (rvalue) { | 187 | if (rvalue) { |
diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c index 83a044dbd1d7..8c777ba4e2b3 100644 --- a/drivers/net/xilinx_emaclite.c +++ b/drivers/net/xilinx_emaclite.c | |||
@@ -660,7 +660,7 @@ static int xemaclite_open(struct net_device *dev) | |||
660 | xemaclite_set_mac_address(lp, dev->dev_addr); | 660 | xemaclite_set_mac_address(lp, dev->dev_addr); |
661 | 661 | ||
662 | /* Grab the IRQ */ | 662 | /* Grab the IRQ */ |
663 | retval = request_irq(dev->irq, &xemaclite_interrupt, 0, dev->name, dev); | 663 | retval = request_irq(dev->irq, xemaclite_interrupt, 0, dev->name, dev); |
664 | if (retval) { | 664 | if (retval) { |
665 | dev_err(&lp->ndev->dev, "Could not allocate interrupt %d\n", | 665 | dev_err(&lp->ndev->dev, "Could not allocate interrupt %d\n", |
666 | dev->irq); | 666 | dev->irq); |
diff --git a/drivers/net/xtsonic.c b/drivers/net/xtsonic.c index 0c44135c0b1f..389ba9df7120 100644 --- a/drivers/net/xtsonic.c +++ b/drivers/net/xtsonic.c | |||
@@ -92,7 +92,7 @@ static unsigned short known_revisions[] = | |||
92 | 92 | ||
93 | static int xtsonic_open(struct net_device *dev) | 93 | static int xtsonic_open(struct net_device *dev) |
94 | { | 94 | { |
95 | if (request_irq(dev->irq,&sonic_interrupt,IRQF_DISABLED,"sonic",dev)) { | 95 | if (request_irq(dev->irq,sonic_interrupt,IRQF_DISABLED,"sonic",dev)) { |
96 | printk(KERN_ERR "%s: unable to get IRQ %d.\n", | 96 | printk(KERN_ERR "%s: unable to get IRQ %d.\n", |
97 | dev->name, dev->irq); | 97 | dev->name, dev->irq); |
98 | return -EAGAIN; | 98 | return -EAGAIN; |
diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c index 40ad0dee0406..d831dfca0976 100644 --- a/drivers/net/yellowfin.c +++ b/drivers/net/yellowfin.c | |||
@@ -579,7 +579,7 @@ static int yellowfin_open(struct net_device *dev) | |||
579 | /* Reset the chip. */ | 579 | /* Reset the chip. */ |
580 | iowrite32(0x80000000, ioaddr + DMACtrl); | 580 | iowrite32(0x80000000, ioaddr + DMACtrl); |
581 | 581 | ||
582 | ret = request_irq(dev->irq, &yellowfin_interrupt, IRQF_SHARED, dev->name, dev); | 582 | ret = request_irq(dev->irq, yellowfin_interrupt, IRQF_SHARED, dev->name, dev); |
583 | if (ret) | 583 | if (ret) |
584 | return ret; | 584 | return ret; |
585 | 585 | ||
diff --git a/drivers/net/znet.c b/drivers/net/znet.c index 443c4eee28c1..a97d894d26fb 100644 --- a/drivers/net/znet.c +++ b/drivers/net/znet.c | |||
@@ -169,7 +169,7 @@ static int znet_request_resources (struct net_device *dev) | |||
169 | { | 169 | { |
170 | struct znet_private *znet = netdev_priv(dev); | 170 | struct znet_private *znet = netdev_priv(dev); |
171 | 171 | ||
172 | if (request_irq (dev->irq, &znet_interrupt, 0, "ZNet", dev)) | 172 | if (request_irq (dev->irq, znet_interrupt, 0, "ZNet", dev)) |
173 | goto failed; | 173 | goto failed; |
174 | if (request_dma (znet->rx_dma, "ZNet rx")) | 174 | if (request_dma (znet->rx_dma, "ZNet rx")) |
175 | goto free_irq; | 175 | goto free_irq; |