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>

diff --git a/drivers/net/3c501.c b/drivers/net/3c501.c
index f60309175ef51e1e84ad0a8db9b365e7d2d5626b..62ceb2b4820c7dbfb504f036097bfd7cf3595460 100644 (file)
--- a/drivers/net/3c501.c
+++ b/drivers/net/3c501.c
@@ -345,7 +345,7 @@ static int el_open(struct net_device *dev)
        if (el_debug > 2)
                pr_debug("%s: Doing el_open()...\n", dev->name);
 
-       retval = request_irq(dev->irq, &el_interrupt, 0, dev->name, dev);
+       retval = request_irq(dev->irq, el_interrupt, 0, dev->name, dev);
        if (retval)
                return retval;
 

diff --git a/drivers/net/3c505.c b/drivers/net/3c505.c
index a21c9d15ef8a53cfd6678c92a4136d23f3a09c3a..9257d7ce037838071379cb65ad635b076014590e 100644 (file)
--- a/drivers/net/3c505.c
+++ b/drivers/net/3c505.c
@@ -886,7 +886,7 @@ static int elp_open(struct net_device *dev)
        /*
         * install our interrupt service routine
         */
-       if ((retval = request_irq(dev->irq, &elp_interrupt, 0, dev->name, dev))) {
+       if ((retval = request_irq(dev->irq, elp_interrupt, 0, dev->name, dev))) {
                pr_err("%s: could not allocate IRQ%d\n", dev->name, dev->irq);
                return retval;
        }

diff --git a/drivers/net/3c507.c b/drivers/net/3c507.c
index a6dc8bcbc7df54c2f5a960b8e037ec186450c262..605f1d17a8f3a129d1bdd28132bedead0002ffe5 100644 (file)
--- 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)
 
        irq = inb(ioaddr + IRQ_CONFIG) & 0x0f;
 
-       irqval = request_irq(irq, &el16_interrupt, 0, DRV_NAME, dev);
+       irqval = request_irq(irq, el16_interrupt, 0, DRV_NAME, dev);
        if (irqval) {
                pr_cont("\n");
                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 3b00a4e927aa115187fa0b3f6dea35f4f406e7c5..8d4ce0964073a3ce60f5bb8623a01d17ab4aec70 100644 (file)
--- a/drivers/net/3c509.c
+++ b/drivers/net/3c509.c
@@ -780,7 +780,7 @@ el3_open(struct net_device *dev)
        outw(RxReset, ioaddr + EL3_CMD);
        outw(SetStatusEnb | 0x00, ioaddr + EL3_CMD);
 
-       i = request_irq(dev->irq, &el3_interrupt, 0, dev->name, dev);
+       i = request_irq(dev->irq, el3_interrupt, 0, dev->name, dev);
        if (i)
                return i;
 

diff --git a/drivers/net/3c515.c b/drivers/net/3c515.c
index 4adcb950f5f1446b59dad15c0bf1149d8e286007..37faf36e24579c57ce83350c997560b33b36a383 100644 (file)
--- a/drivers/net/3c515.c
+++ b/drivers/net/3c515.c
@@ -766,11 +766,11 @@ static int corkscrew_open(struct net_device *dev)
                /* Corkscrew: Cannot share ISA resources. */
                if (dev->irq == 0
                    || dev->dma == 0
-                   || request_irq(dev->irq, &corkscrew_interrupt, 0,
+                   || request_irq(dev->irq, corkscrew_interrupt, 0,
                                   vp->product_name, dev)) return -EAGAIN;
                enable_dma(dev->dma);
                set_dma_mode(dev->dma, DMA_MODE_CASCADE);
-       } else if (request_irq(dev->irq, &corkscrew_interrupt, IRQF_SHARED,
+       } else if (request_irq(dev->irq, corkscrew_interrupt, IRQF_SHARED,
                               vp->product_name, dev)) {
                return -EAGAIN;
        }

diff --git a/drivers/net/3c523.c b/drivers/net/3c523.c
index cb0b730799ba573994eb85895e8d456ade8bf5d6..27d80ca5e4c09dfef689927c4ffd419cc87563ec 100644 (file)
--- a/drivers/net/3c523.c
+++ b/drivers/net/3c523.c
@@ -288,7 +288,7 @@ static int elmc_open(struct net_device *dev)
 
        elmc_id_attn586();      /* disable interrupts */
 
-       ret = request_irq(dev->irq, &elmc_interrupt, IRQF_SHARED | IRQF_SAMPLE_RANDOM,
+       ret = request_irq(dev->irq, elmc_interrupt, IRQF_SHARED | IRQF_SAMPLE_RANDOM,
                          dev->name, dev);
        if (ret) {
                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 6021e6dded8fad4bbc18fcf6b160d2e21c42cf16..d91c3464fe7295aa54d04bdd132dd375f4c7a101 100644 (file)
--- 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)
         *      Grab the IRQ
         */
 
-       err = request_irq(dev->irq, &mc32_interrupt, IRQF_SHARED | IRQF_SAMPLE_RANDOM, DRV_NAME, dev);
+       err = request_irq(dev->irq, mc32_interrupt, IRQF_SHARED | IRQF_SAMPLE_RANDOM, DRV_NAME, dev);
        if (err) {
                release_region(dev->base_addr, MC32_IO_EXTENT);
                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 b5dc7f55072507fc5764af4258ee8fcc0b3b266f..50cecf417471ebe5a52b02092482e947667bff6c 100644 (file)
--- 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)
 
        /* Reserve any actual interrupt. */
        if (dev->irq) {
-               retval = request_irq(dev->irq, &cops_interrupt, 0, dev->name, dev);
+               retval = request_irq(dev->irq, cops_interrupt, 0, dev->name, dev);
                if (retval)
                        goto err_out;
        }

diff --git a/drivers/net/appletalk/ltpc.c b/drivers/net/appletalk/ltpc.c
index 08760baece7ac97fc638f52bf4b6a66251dcdaff..dbfbd3b7ff86620fd310a1e435e39c29425c39c2 100644 (file)
--- a/drivers/net/appletalk/ltpc.c
+++ b/drivers/net/appletalk/ltpc.c
@@ -1158,7 +1158,7 @@ struct net_device * __init ltpc_probe(void)
        }
 
        /* grab it and don't let go :-) */
-       if (irq && request_irq( irq, &ltpc_interrupt, 0, "ltpc", dev) >= 0)
+       if (irq && request_irq( irq, ltpc_interrupt, 0, "ltpc", dev) >= 0)
        {
                (void) inb_p(io+7);  /* enable interrupts from board */
                (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 e3082a9350fcafcd2b1a90ae21cdc08a284f15b4..c5b988140a91b548244c6ee2d348aab72720f928 100644 (file)
--- 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)
        }
 
        /* reserve the irq */
-       if (request_irq(dev->irq, &arcnet_interrupt, 0, "arcnet (RIM I)", dev)) {
+       if (request_irq(dev->irq, arcnet_interrupt, 0, "arcnet (RIM I)", dev)) {
                iounmap(p);
                release_mem_region(dev->mem_start, MIRROR_SIZE);
                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 651275a5f3d27020022d1682930c89a7db6ace3b..0a74f21409c5c91a7362ac9aa78460ba30c5dc66 100644 (file)
--- 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)
        outb(dev->dev_addr[0], _XREG);
 
        /* reserve the irq */
-       if (request_irq(dev->irq, &arcnet_interrupt, shared,
+       if (request_irq(dev->irq, arcnet_interrupt, shared,
                        "arcnet (COM20020)", dev)) {
                BUGMSG(D_NORMAL, "Can't get IRQ %d!\n", dev->irq);
                return -ENODEV;

diff --git a/drivers/net/arcnet/com90io.c b/drivers/net/arcnet/com90io.c
index 89de29b3b1dc0d09628b093fb6ac34483984716e..28dea518d554bcca703171f5472c30699c214438 100644 (file)
--- 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)
        int err;
 
        /* Reserve the irq */
-       if (request_irq(dev->irq, &arcnet_interrupt, 0, "arcnet (COM90xx-IO)", dev)) {
+       if (request_irq(dev->irq, arcnet_interrupt, 0, "arcnet (COM90xx-IO)", dev)) {
                BUGMSG(D_NORMAL, "Can't get IRQ %d!\n", dev->irq);
                return -ENODEV;
        }

diff --git a/drivers/net/arcnet/com90xx.c b/drivers/net/arcnet/com90xx.c
index d762fe46251eb0fc62bdbacda2990cf3f89ff066..112e230cb13d22d46f6c7d2bc38db1075c9ddb94 100644 (file)
--- 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
                goto err_free_dev;
 
        /* reserve the irq */
-       if (request_irq(airq, &arcnet_interrupt, 0, "arcnet (90xx)", dev)) {
+       if (request_irq(airq, arcnet_interrupt, 0, "arcnet (90xx)", dev)) {
                BUGMSG(D_NORMAL, "Can't get IRQ %d!\n", airq);
                goto err_release_mem;
        }

diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c
index 544d5af6950ec8fd577d3999d5f8b61e8ff4e96e..d4ab69f032be5c7316fdd14240403847ac7124e3 100644 (file)
--- a/drivers/net/at1700.c
+++ b/drivers/net/at1700.c
@@ -468,7 +468,7 @@ found:
        lp->jumpered = is_fmv18x;
        lp->mca_slot = slot;
        /* Snarf the interrupt vector now. */
-       ret = request_irq(irq, &net_interrupt, 0, DRV_NAME, dev);
+       ret = request_irq(irq, net_interrupt, 0, DRV_NAME, dev);
        if (ret) {
                printk(KERN_ERR "AT1700 at %#3x is unusable due to a "
                       "conflict on IRQ %d.\n",

diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c
index 8b889ab544b0e4485e97ad2df96f15e77d438b0a..ad17e74e5662035fc694dc2c77638aff2251ae06 100644 (file)
--- 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)
 
        if (!adapter->have_msi)
                flags |= IRQF_SHARED;
-       err = request_irq(adapter->pdev->irq, &atl1e_intr, flags,
+       err = request_irq(adapter->pdev->irq, atl1e_intr, flags,
                        netdev->name, netdev);
        if (err) {
                dev_dbg(&pdev->dev,

diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c
index 963df502260a2ef9e15b721ee933b155fba90e94..e547f788a2660c4d22e7c11ad3ae2d4f6a076cb2 100644 (file)
--- a/drivers/net/atlx/atl1.c
+++ b/drivers/net/atlx/atl1.c
@@ -2589,7 +2589,7 @@ static s32 atl1_up(struct atl1_adapter *adapter)
                irq_flags |= IRQF_SHARED;
        }
 
-       err = request_irq(adapter->pdev->irq, &atl1_intr, irq_flags,
+       err = request_irq(adapter->pdev->irq, atl1_intr, irq_flags,
                        netdev->name, netdev);
        if (unlikely(err))
                goto err_up;

diff --git a/drivers/net/atlx/atl2.c b/drivers/net/atlx/atl2.c
index 0d268075bad5d3852e673de701a80c9595860fee..c0451d75cdcf56d52ec5ae9be0ce0f9206aede5d 100644 (file)
--- 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)
        if (adapter->have_msi)
                flags &= ~IRQF_SHARED;
 
-       return request_irq(adapter->pdev->irq, &atl2_intr, flags, netdev->name,
+       return request_irq(adapter->pdev->irq, atl2_intr, flags, netdev->name,
                netdev);
 }
 

diff --git a/drivers/net/atp.c b/drivers/net/atp.c
index 9043294fe617b6ac130cf40469524eef934a9d44..001791775be3d0c871071ab1a85998cf38edd455 100644 (file)
--- a/drivers/net/atp.c
+++ b/drivers/net/atp.c
@@ -437,7 +437,7 @@ static int net_open(struct net_device *dev)
        /* The interrupt line is turned off (tri-stated) when the device isn't in
           use.  That's especially important for "attached" interfaces where the
           port or interrupt may be shared. */
-       ret = request_irq(dev->irq, &atp_interrupt, 0, dev->name, dev);
+       ret = request_irq(dev->irq, atp_interrupt, 0, dev->name, dev);
        if (ret)
                return ret;
 

diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c
index ce6f1ac25df83e6ea3b26298f707cad6a9e488a3..e67533cf78d81f9ec3db9e7c592513709b891819 100644 (file)
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
@@ -881,7 +881,7 @@ static int au1000_open(struct net_device *dev)
        if (au1000_debug > 4)
                printk("%s: open: dev=%p\n", dev->name, dev);
 
-       if ((retval = request_irq(dev->irq, &au1000_interrupt, 0,
+       if ((retval = request_irq(dev->irq, au1000_interrupt, 0,
                                        dev->name, dev))) {
                printk(KERN_ERR "%s: unable to get IRQ %d\n",
                                dev->name, dev->irq);

diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
index 0c54219960e2b11dcb42c8dbabf9f562f5022823..af9321617ce457bd0d42ba7d447ee3af39f7f07f 100644 (file)
--- a/drivers/net/cs89x0.c
+++ b/drivers/net/cs89x0.c
@@ -1323,7 +1323,7 @@ net_open(struct net_device *dev)
                writereg(dev, PP_BusCTL, ENABLE_IRQ | MEMORY_ON);
 #endif
                write_irq(dev, lp->chip_type, dev->irq);
-               ret = request_irq(dev->irq, &net_interrupt, 0, dev->name, dev);
+               ret = request_irq(dev->irq, net_interrupt, 0, dev->name, dev);
                if (ret) {
                        if (net_debug)
                                printk(KERN_DEBUG "cs89x0: request_irq(%d) failed\n", dev->irq);

diff --git a/drivers/net/declance.c b/drivers/net/declance.c
index a31696a3928e6d05eda0f18da681f47ea4fa7bf7..be9590253aa1cd53ff3731006790ff0379089128 100644 (file)
--- a/drivers/net/declance.c
+++ b/drivers/net/declance.c
@@ -801,14 +801,14 @@ static int lance_open(struct net_device *dev)
        netif_start_queue(dev);
 
        /* Associate IRQ with lance_interrupt */
-       if (request_irq(dev->irq, &lance_interrupt, 0, "lance", dev)) {
+       if (request_irq(dev->irq, lance_interrupt, 0, "lance", dev)) {
                printk("%s: Can't get IRQ %d\n", dev->name, dev->irq);
                return -EAGAIN;
        }
        if (lp->dma_irq >= 0) {
                unsigned long flags;
 
-               if (request_irq(lp->dma_irq, &lance_dma_merr_int, 0,
+               if (request_irq(lp->dma_irq, lance_dma_merr_int, 0,
                                "lance error", dev)) {
                        free_irq(dev->irq, dev);
                        printk("%s: Can't get DMA IRQ %d\n", dev->name,

diff --git a/drivers/net/depca.c b/drivers/net/depca.c
index 7a3bdac84abe9b89705f373da12761b957064285..0c1f491d20bfecf6605cec2843e79feba2ba40fc 100644 (file)
--- a/drivers/net/depca.c
+++ b/drivers/net/depca.c
@@ -849,7 +849,7 @@ static int depca_open(struct net_device *dev)
 
        depca_dbg_open(dev);
 
-       if (request_irq(dev->irq, &depca_interrupt, 0, lp->adapter_name, dev)) {
+       if (request_irq(dev->irq, depca_interrupt, 0, lp->adapter_name, dev)) {
                printk("depca_open(): Requested IRQ%d is busy\n", dev->irq);
                status = -EAGAIN;
        } else {

diff --git a/drivers/net/dl2k.c b/drivers/net/dl2k.c
index ce8fef184f2c0297f6fad02429c31cd48b83416a..a2f1860fdd16446e96d79a7244fe3d0831289009 100644 (file)
--- a/drivers/net/dl2k.c
+++ b/drivers/net/dl2k.c
@@ -411,7 +411,7 @@ rio_open (struct net_device *dev)
        int i;
        u16 macctrl;
 
-       i = request_irq (dev->irq, &rio_interrupt, IRQF_SHARED, dev->name, dev);
+       i = request_irq (dev->irq, rio_interrupt, IRQF_SHARED, dev->name, dev);
        if (i)
                return i;
 

diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index 3aab2e466008cf78d3023e21d399ee863e4a1fee..81590fbb994370aeb86aade6c88a594b6fa184e0 100644 (file)
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -1175,7 +1175,7 @@ dm9000_open(struct net_device *dev)
 
        irqflags |= IRQF_SHARED;
 
-       if (request_irq(dev->irq, &dm9000_interrupt, irqflags, dev->name, dev))
+       if (request_irq(dev->irq, dm9000_interrupt, irqflags, dev->name, dev))
                return -EAGAIN;
 
        /* Initialize DM9000 board */

diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index ffbae0a0b4f12c9f377c073e14e4675f8f62382f..13e9ece168898be9cde1265857f95ee29544b250 100644 (file)
--- 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)
 
        /* NOTE: we don't test MSI interrupts here, yet */
        /* Hook up test interrupt handler just for this test */
-       if (!request_irq(irq, &e1000_test_intr, IRQF_PROBE_SHARED, netdev->name,
+       if (!request_irq(irq, e1000_test_intr, IRQF_PROBE_SHARED, netdev->name,
                         netdev))
                shared_int = false;
-       else if (request_irq(irq, &e1000_test_intr, IRQF_SHARED,
+       else if (request_irq(irq, e1000_test_intr, IRQF_SHARED,
                 netdev->name, netdev)) {
                *data = 1;
                return -1;

diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c
index 0364b91488af1dbcc860859dedf3b1066d0d3353..c430dc8b70a33236972885c30ba92e7e5b947e71 100644 (file)
--- 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)
                e1000e_set_interrupt_capability(adapter);
        }
        /* Hook up test interrupt handler just for this test */
-       if (!request_irq(irq, &e1000_test_intr, IRQF_PROBE_SHARED, netdev->name,
+       if (!request_irq(irq, e1000_test_intr, IRQF_PROBE_SHARED, netdev->name,
                         netdev)) {
                shared_int = 0;
-       } else if (request_irq(irq, &e1000_test_intr, IRQF_SHARED,
+       } else if (request_irq(irq, e1000_test_intr, IRQF_SHARED,
                 netdev->name, netdev)) {
                *data = 1;
                ret_val = -1;

diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 376924804f3ff0e45b6ee150f9fd6327c72ba230..3caa1d5893c42ef244134ecfe0bfbc6e9eb2515a 100644 (file)
--- 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)
        else
                memcpy(adapter->rx_ring->name, netdev->name, IFNAMSIZ);
        err = request_irq(adapter->msix_entries[vector].vector,
-                         &e1000_intr_msix_rx, 0, adapter->rx_ring->name,
+                         e1000_intr_msix_rx, 0, adapter->rx_ring->name,
                          netdev);
        if (err)
                goto out;
@@ -1471,7 +1471,7 @@ static int e1000_request_msix(struct e1000_adapter *adapter)
        else
                memcpy(adapter->tx_ring->name, netdev->name, IFNAMSIZ);
        err = request_irq(adapter->msix_entries[vector].vector,
-                         &e1000_intr_msix_tx, 0, adapter->tx_ring->name,
+                         e1000_intr_msix_tx, 0, adapter->tx_ring->name,
                          netdev);
        if (err)
                goto out;
@@ -1480,7 +1480,7 @@ static int e1000_request_msix(struct e1000_adapter *adapter)
        vector++;
 
        err = request_irq(adapter->msix_entries[vector].vector,
-                         &e1000_msix_other, 0, netdev->name, netdev);
+                         e1000_msix_other, 0, netdev->name, netdev);
        if (err)
                goto out;
 
@@ -1511,7 +1511,7 @@ static int e1000_request_irq(struct e1000_adapter *adapter)
                e1000e_set_interrupt_capability(adapter);
        }
        if (adapter->flags & FLAG_MSI_ENABLED) {
-               err = request_irq(adapter->pdev->irq, &e1000_intr_msi, 0,
+               err = request_irq(adapter->pdev->irq, e1000_intr_msi, 0,
                                  netdev->name, netdev);
                if (!err)
                        return err;
@@ -1521,7 +1521,7 @@ static int e1000_request_irq(struct e1000_adapter *adapter)
                adapter->int_mode = E1000E_INT_MODE_LEGACY;
        }
 
-       err = request_irq(adapter->pdev->irq, &e1000_intr, IRQF_SHARED,
+       err = request_irq(adapter->pdev->irq, e1000_intr, IRQF_SHARED,
                          netdev->name, netdev);
        if (err)
                e_err("Unable to allocate interrupt, Error: %d\n", err);
@@ -2970,7 +2970,7 @@ static int e1000_test_msi_interrupt(struct e1000_adapter *adapter)
        if (err)
                goto msi_test_failed;
 
-       err = request_irq(adapter->pdev->irq, &e1000_intr_msi_test, 0,
+       err = request_irq(adapter->pdev->irq, e1000_intr_msi_test, 0,
                          netdev->name, netdev);
        if (err) {
                pci_disable_msi(adapter->pdev);

diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c
index 1e934160062c597e835c3bd05e98119da9e15473..94c59498cdb6bf4491782c91cb6a03a5acb13948 100644 (file)
--- a/drivers/net/eepro.c
+++ b/drivers/net/eepro.c
@@ -990,7 +990,7 @@ static int eepro_open(struct net_device *dev)
                return -EAGAIN;
        }
 
-       if (request_irq(dev->irq , &eepro_interrupt, 0, dev->name, dev)) {
+       if (request_irq(dev->irq , eepro_interrupt, 0, dev->name, dev)) {
                printk(KERN_ERR "%s: unable to get IRQ %d.\n", dev->name, dev->irq);
                return -EAGAIN;
        }

diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c
index 592de8f1668a9e78bff34f9116194eb3ec6babef..6fbfc8eee6328b4391d744ea21e5923f35c6b428 100644 (file)
--- a/drivers/net/eexpress.c
+++ b/drivers/net/eexpress.c
@@ -457,7 +457,7 @@ static int eexp_open(struct net_device *dev)
        if (!dev->irq || !irqrmap[dev->irq])
                return -ENXIO;
 
-       ret = request_irq(dev->irq, &eexp_irq, 0, dev->name, dev);
+       ret = request_irq(dev->irq, eexp_irq, 0, dev->name, dev);
        if (ret)
                return ret;
 

diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c
index 641a10d2e8434ee70b0bb841f9bdc7fd70613640..703b4c8e9b4d1fa6a8c2e0188c68e6d2ad8c8cef 100644 (file)
--- a/drivers/net/epic100.c
+++ b/drivers/net/epic100.c
@@ -668,7 +668,7 @@ static int epic_open(struct net_device *dev)
        outl(0x4001, ioaddr + GENCTL);
 
        napi_enable(&ep->napi);
-       if ((retval = request_irq(dev->irq, &epic_interrupt, IRQF_SHARED, dev->name, dev))) {
+       if ((retval = request_irq(dev->irq, epic_interrupt, IRQF_SHARED, dev->name, dev))) {
                napi_disable(&ep->napi);
                return retval;
        }

diff --git a/drivers/net/fealnx.c b/drivers/net/fealnx.c
index 18d5fbb9673eefb4b02a1fb3847767c50bdd11e7..e173515790c0faad1d1498bc52c484182a8715d5 100644 (file)
--- a/drivers/net/fealnx.c
+++ b/drivers/net/fealnx.c
@@ -839,7 +839,7 @@ static int netdev_open(struct net_device *dev)
 
        iowrite32(0x00000001, ioaddr + BCR);    /* Reset */
 
-       if (request_irq(dev->irq, &intr_handler, IRQF_SHARED, dev->name, dev))
+       if (request_irq(dev->irq, intr_handler, IRQF_SHARED, dev->name, dev))
                return -EAGAIN;
 
        for (i = 0; i < 3; i++)

diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c
index 66dace6d324f307ae3474616c04ea2fdc373c811..6407672b28e96aac3491835c85eaa88684773474 100644 (file)
--- 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)
                phy_start(priv->phydev);
        }
 
-       if (request_irq(dev->irq, &mpc52xx_fec_interrupt, IRQF_SHARED,
+       if (request_irq(dev->irq, mpc52xx_fec_interrupt, IRQF_SHARED,
                        DRIVER_NAME "_ctrl", dev)) {
                dev_err(&dev->dev, "ctrl interrupt request failed\n");
                goto free_phy;
        }
-       if (request_irq(priv->r_irq, &mpc52xx_fec_rx_interrupt, 0,
+       if (request_irq(priv->r_irq, mpc52xx_fec_rx_interrupt, 0,
                        DRIVER_NAME "_rx", dev)) {
                dev_err(&dev->dev, "rx interrupt request failed\n");
                goto free_ctrl_irq;
        }
-       if (request_irq(priv->t_irq, &mpc52xx_fec_tx_interrupt, 0,
+       if (request_irq(priv->t_irq, mpc52xx_fec_tx_interrupt, 0,
                        DRIVER_NAME "_tx", dev)) {
                dev_err(&dev->dev, "tx interrupt request failed\n");
                goto free_2irqs;

diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 3116601dbfea859984fa480edd0ecd4db5893e4e..3c340489804a9bc6f3b8cc65826795033efcbf12 100644 (file)
--- 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)
                                /* Request irq for rx handling */
                                sprintf(np->name_rx, "%s-rx", dev->name);
                                if (request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_RX].vector,
-                                               &nv_nic_irq_rx, IRQF_SHARED, np->name_rx, dev) != 0) {
+                                               nv_nic_irq_rx, IRQF_SHARED, np->name_rx, dev) != 0) {
                                        printk(KERN_INFO "forcedeth: request_irq failed for rx %d\n", ret);
                                        pci_disable_msix(np->pci_dev);
                                        np->msi_flags &= ~NV_MSI_X_ENABLED;
@@ -4013,7 +4013,7 @@ static int nv_request_irq(struct net_device *dev, int intr_test)
                                /* Request irq for tx handling */
                                sprintf(np->name_tx, "%s-tx", dev->name);
                                if (request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_TX].vector,
-                                               &nv_nic_irq_tx, IRQF_SHARED, np->name_tx, dev) != 0) {
+                                               nv_nic_irq_tx, IRQF_SHARED, np->name_tx, dev) != 0) {
                                        printk(KERN_INFO "forcedeth: request_irq failed for tx %d\n", ret);
                                        pci_disable_msix(np->pci_dev);
                                        np->msi_flags &= ~NV_MSI_X_ENABLED;
@@ -4022,7 +4022,7 @@ static int nv_request_irq(struct net_device *dev, int intr_test)
                                /* Request irq for link and timer handling */
                                sprintf(np->name_other, "%s-other", dev->name);
                                if (request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_OTHER].vector,
-                                               &nv_nic_irq_other, IRQF_SHARED, np->name_other, dev) != 0) {
+                                               nv_nic_irq_other, IRQF_SHARED, np->name_other, dev) != 0) {
                                        printk(KERN_INFO "forcedeth: request_irq failed for link %d\n", ret);
                                        pci_disable_msix(np->pci_dev);
                                        np->msi_flags &= ~NV_MSI_X_ENABLED;

diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c
index c9ac46118e6fef35eba30e2787908a503819a78f..5d8c6333070e227a0426a467a3a5af0fe2a22241 100644 (file)
--- a/drivers/net/hamachi.c
+++ b/drivers/net/hamachi.c
@@ -872,7 +872,7 @@ static int hamachi_open(struct net_device *dev)
        u32 rx_int_var, tx_int_var;
        u16 fifo_info;
 
-       i = request_irq(dev->irq, &hamachi_interrupt, IRQF_SHARED, dev->name, dev);
+       i = request_irq(dev->irq, hamachi_interrupt, IRQF_SHARED, dev->name, dev);
        if (i)
                return i;
 

diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index 5862282ab2fef6eb3b90b2db059b126d138b2d73..a86693906ac8ca5659a5efad63afd517dc04917c 100644 (file)
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -625,7 +625,7 @@ static int ibmveth_open(struct net_device *netdev)
        }
 
        ibmveth_debug_printk("registering irq 0x%x\n", netdev->irq);
-       if((rc = request_irq(netdev->irq, &ibmveth_interrupt, 0, netdev->name, netdev)) != 0) {
+       if((rc = request_irq(netdev->irq, ibmveth_interrupt, 0, netdev->name, netdev)) != 0) {
                ibmveth_error_printk("unable to request irq 0x%x, rc %d\n", netdev->irq, rc);
                do {
                        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 88e13f7e566fb79dd65d6dad330bcb096336625d..2e238bfa1f9131d9f919d0789e8e50a227cbfae2 100644 (file)
--- 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)
        /* Hook up test interrupt handler just for this test */
        if (adapter->msix_entries) {
                if (request_irq(adapter->msix_entries[0].vector,
-                               &igb_test_intr, 0, netdev->name, adapter)) {
+                               igb_test_intr, 0, netdev->name, adapter)) {
                        *data = 1;
                        return -1;
                }
        } else if (adapter->flags & IGB_FLAG_HAS_MSI) {
                shared_int = false;
                if (request_irq(irq,
-                               &igb_test_intr, 0, netdev->name, adapter)) {
+                               igb_test_intr, 0, netdev->name, adapter)) {
                        *data = 1;
                        return -1;
                }
-       } else if (!request_irq(irq, &igb_test_intr, IRQF_PROBE_SHARED,
+       } else if (!request_irq(irq, igb_test_intr, IRQF_PROBE_SHARED,
                                netdev->name, adapter)) {
                shared_int = false;
-       } else if (request_irq(irq, &igb_test_intr, IRQF_SHARED,
+       } else if (request_irq(irq, igb_test_intr, IRQF_SHARED,
                 netdev->name, adapter)) {
                *data = 1;
                return -1;

diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 0cab5e2b08947d7ffef057df9c0077cb6461cc54..958305e92d679e3354d366c7d2a3dcaa91b422ab 100644 (file)
--- 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)
        int i, err = 0, vector = 0;
 
        err = request_irq(adapter->msix_entries[vector].vector,
-                         &igb_msix_other, 0, netdev->name, adapter);
+                         igb_msix_other, 0, netdev->name, adapter);
        if (err)
                goto out;
        vector++;
@@ -548,7 +548,7 @@ static int igb_request_msix(struct igb_adapter *adapter)
                        sprintf(q_vector->name, "%s-unused", netdev->name);
 
                err = request_irq(adapter->msix_entries[vector].vector,
-                                 &igb_msix_ring, 0, q_vector->name,
+                                 igb_msix_ring, 0, q_vector->name,
                                  q_vector);
                if (err)
                        goto out;
@@ -875,7 +875,7 @@ static int igb_request_irq(struct igb_adapter *adapter)
        }
 
        if (adapter->flags & IGB_FLAG_HAS_MSI) {
-               err = request_irq(adapter->pdev->irq, &igb_intr_msi, 0,
+               err = request_irq(adapter->pdev->irq, igb_intr_msi, 0,
                                  netdev->name, adapter);
                if (!err)
                        goto request_done;
@@ -885,7 +885,7 @@ static int igb_request_irq(struct igb_adapter *adapter)
                adapter->flags &= ~IGB_FLAG_HAS_MSI;
        }
 
-       err = request_irq(adapter->pdev->irq, &igb_intr, IRQF_SHARED,
+       err = request_irq(adapter->pdev->irq, igb_intr, IRQF_SHARED,
                          netdev->name, adapter);
 
        if (err)

diff --git a/drivers/net/igbvf/netdev.c b/drivers/net/igbvf/netdev.c
index fad7f348dd1b2d0a55709d1f319dc788449c874a..e01f44597a26db219581ea1588c323d563138c07 100644 (file)
--- 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)
        }
 
        err = request_irq(adapter->msix_entries[vector].vector,
-                         &igbvf_intr_msix_tx, 0, adapter->tx_ring->name,
+                         igbvf_intr_msix_tx, 0, adapter->tx_ring->name,
                          netdev);
        if (err)
                goto out;
@@ -1053,7 +1053,7 @@ static int igbvf_request_msix(struct igbvf_adapter *adapter)
        vector++;
 
        err = request_irq(adapter->msix_entries[vector].vector,
-                         &igbvf_intr_msix_rx, 0, adapter->rx_ring->name,
+                         igbvf_intr_msix_rx, 0, adapter->rx_ring->name,
                          netdev);
        if (err)
                goto out;
@@ -1063,7 +1063,7 @@ static int igbvf_request_msix(struct igbvf_adapter *adapter)
        vector++;
 
        err = request_irq(adapter->msix_entries[vector].vector,
-                         &igbvf_msix_other, 0, netdev->name, netdev);
+                         igbvf_msix_other, 0, netdev->name, netdev);
        if (err)
                goto out;
 

diff --git a/drivers/net/irda/au1k_ir.c b/drivers/net/irda/au1k_ir.c
index eb424681202d2aaefefa3c729b87d4868151a0a6..9b2eebdbb25b016ff26cb916bfcbda00b9afa003 100644 (file)
--- 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)
                return retval;
        }
 
-       if ((retval = request_irq(AU1000_IRDA_TX_INT, &au1k_irda_interrupt, 
+       if ((retval = request_irq(AU1000_IRDA_TX_INT, au1k_irda_interrupt, 
                                        0, dev->name, dev))) {
                printk(KERN_ERR "%s: unable to get IRQ %d\n", 
                                dev->name, dev->irq);
                return retval;
        }
-       if ((retval = request_irq(AU1000_IRDA_RX_INT, &au1k_irda_interrupt, 
+       if ((retval = request_irq(AU1000_IRDA_RX_INT, au1k_irda_interrupt, 
                                        0, dev->name, dev))) {
                free_irq(AU1000_IRDA_TX_INT, dev);
                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 9706e64e367bf4e5a8c1fd11472238a10e647dc5..0e71e2a93160d4648942511f8fee6e58246c5e63 100644 (file)
--- 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)
                dev->irq = 9;
 
        {
-               int irqval = request_irq(dev->irq, &net_interrupt, 0, cardname, dev);
+               int irqval = request_irq(dev->irq, net_interrupt, 0, cardname, dev);
                if (irqval) {
                        printk("%s: unable to get IRQ %d (irqval=%d).\n",
                                   dev->name, dev->irq, irqval);
@@ -378,7 +378,7 @@ net_open(struct net_device *dev)
         * This is used if the interrupt line can turned off (shared).
         * See 3c503.c for an example of selecting the IRQ at config-time.
         */
-       if (request_irq(dev->irq, &net_interrupt, 0, cardname, dev)) {
+       if (request_irq(dev->irq, net_interrupt, 0, cardname, dev)) {
                return -EAGAIN;
        }
        /*

diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index 1bd0ca1b0465bf5b0561bf0228d538dc740834f5..73646062e8dd32e91bacbc4063d997eb8a2586d5 100644 (file)
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -233,7 +233,7 @@ ixgb_up(struct ixgb_adapter *adapter)
                /* proceed to try to request regular interrupt */
        }
 
-       err = request_irq(adapter->pdev->irq, &ixgb_intr, irq_flags,
+       err = request_irq(adapter->pdev->irq, ixgb_intr, irq_flags,
                          netdev->name, netdev);
        if (err) {
                if (adapter->have_msi)

diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c
index 9d2cc833691b42c1b3a2d67e6f9f7e94d3193923..74f04e183545213173d685d69724fba55b7b6f17 100644 (file)
--- 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)
                return 0;
        } else if (adapter->flags & IXGBE_FLAG_MSI_ENABLED) {
                shared_int = false;
-               if (request_irq(irq, &ixgbe_test_intr, 0, netdev->name,
+               if (request_irq(irq, ixgbe_test_intr, 0, netdev->name,
                                netdev)) {
                        *data = 1;
                        return -1;
                }
-       } else if (!request_irq(irq, &ixgbe_test_intr, IRQF_PROBE_SHARED,
+       } else if (!request_irq(irq, ixgbe_test_intr, IRQF_PROBE_SHARED,
                                netdev->name, netdev)) {
                shared_int = false;
-       } else if (request_irq(irq, &ixgbe_test_intr, IRQF_SHARED,
+       } else if (request_irq(irq, ixgbe_test_intr, IRQF_SHARED,
                               netdev->name, netdev)) {
                *data = 1;
                return -1;

diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index dceed80f16fb6daa94eec507d8271acc7996097a..ebcec30e0783e5582ff568595975789d56cc1f88 100644 (file)
--- 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)
 
        sprintf(adapter->name[vector], "%s:lsc", netdev->name);
        err = request_irq(adapter->msix_entries[vector].vector,
-                         &ixgbe_msix_lsc, 0, adapter->name[vector], netdev);
+                         ixgbe_msix_lsc, 0, adapter->name[vector], netdev);
        if (err) {
                DPRINTK(PROBE, ERR,
                        "request_irq for msix_lsc failed: %d\n", err);
@@ -1832,10 +1832,10 @@ static int ixgbe_request_irq(struct ixgbe_adapter *adapter)
        if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) {
                err = ixgbe_request_msix_irqs(adapter);
        } else if (adapter->flags & IXGBE_FLAG_MSI_ENABLED) {
-               err = request_irq(adapter->pdev->irq, &ixgbe_intr, 0,
+               err = request_irq(adapter->pdev->irq, ixgbe_intr, 0,
                                  netdev->name, netdev);
        } else {
-               err = request_irq(adapter->pdev->irq, &ixgbe_intr, IRQF_SHARED,
+               err = request_irq(adapter->pdev->irq, ixgbe_intr, IRQF_SHARED,
                                  netdev->name, netdev);
        }
 

diff --git a/drivers/net/jazzsonic.c b/drivers/net/jazzsonic.c
index 6e5b3f30527f048d0dca9ea6835d04f94e33202a..35d5bed450dab85b1ee5b828912df492dc5a52ab 100644 (file)
--- a/drivers/net/jazzsonic.c
+++ b/drivers/net/jazzsonic.c
@@ -81,7 +81,7 @@ static unsigned short known_revisions[] =
 
 static int jazzsonic_open(struct net_device* dev)
 {
-       if (request_irq(dev->irq, &sonic_interrupt, IRQF_DISABLED, "sonic", dev)) {
+       if (request_irq(dev->irq, sonic_interrupt, IRQF_DISABLED, "sonic", dev)) {
                printk(KERN_ERR "%s: unable to get IRQ %d.\n", dev->name, dev->irq);
                return -EAGAIN;
        }

diff --git a/drivers/net/korina.c b/drivers/net/korina.c
index a07a5972b57e2f1d671cb8c8b7a50f3cc382da06..25e2af6997e4316286c762bf31964ddeb16f66ae 100644 (file)
--- a/drivers/net/korina.c
+++ b/drivers/net/korina.c
@@ -1014,14 +1014,14 @@ static int korina_open(struct net_device *dev)
        /* Install the interrupt handler
         * that handles the Done Finished
         * Ovr and Und Events */
-       ret = request_irq(lp->rx_irq, &korina_rx_dma_interrupt,
+       ret = request_irq(lp->rx_irq, korina_rx_dma_interrupt,
                        IRQF_DISABLED, "Korina ethernet Rx", dev);
        if (ret < 0) {
                printk(KERN_ERR "%s: unable to get Rx DMA IRQ %d\n",
                    dev->name, lp->rx_irq);
                goto err_release;
        }
-       ret = request_irq(lp->tx_irq, &korina_tx_dma_interrupt,
+       ret = request_irq(lp->tx_irq, korina_tx_dma_interrupt,
                        IRQF_DISABLED, "Korina ethernet Tx", dev);
        if (ret < 0) {
                printk(KERN_ERR "%s: unable to get Tx DMA IRQ %d\n",
@@ -1030,7 +1030,7 @@ static int korina_open(struct net_device *dev)
        }
 
        /* Install handler for overrun error. */
-       ret = request_irq(lp->ovr_irq, &korina_ovr_interrupt,
+       ret = request_irq(lp->ovr_irq, korina_ovr_interrupt,
                        IRQF_DISABLED, "Ethernet Overflow", dev);
        if (ret < 0) {
                printk(KERN_ERR "%s: unable to get OVR IRQ %d\n",
@@ -1039,7 +1039,7 @@ static int korina_open(struct net_device *dev)
        }
 
        /* Install handler for underflow error. */
-       ret = request_irq(lp->und_irq, &korina_und_interrupt,
+       ret = request_irq(lp->und_irq, korina_und_interrupt,
                        IRQF_DISABLED, "Ethernet Underflow", dev);
        if (ret < 0) {
                printk(KERN_ERR "%s: unable to get UND IRQ %d\n",

diff --git a/drivers/net/lance.c b/drivers/net/lance.c
index dcda30338b65bfb9d9fb70930b5d0e4d266c8849..7b2c42992c3587561b4f9e0b7a408a5fbca64b28 100644 (file)
--- a/drivers/net/lance.c
+++ b/drivers/net/lance.c
@@ -755,7 +755,7 @@ lance_open(struct net_device *dev)
        int i;
 
        if (dev->irq == 0 ||
-               request_irq(dev->irq, &lance_interrupt, 0, lp->name, dev)) {
+               request_irq(dev->irq, lance_interrupt, 0, lp->name, dev)) {
                return -EAGAIN;
        }
 

diff --git a/drivers/net/lib82596.c b/drivers/net/lib82596.c
index 5b24c67de25e6a9b5c92f32dc3b53eb10b93296d..7a07430206e3fa91e63846fa4a5d34952f6e88c1 100644 (file)
--- a/drivers/net/lib82596.c
+++ b/drivers/net/lib82596.c
@@ -588,7 +588,7 @@ static int init_i596_mem(struct net_device *dev)
                             "%s: i82596 initialization successful\n",
                             dev->name));
 
-       if (request_irq(dev->irq, &i596_interrupt, 0, "i82596", dev)) {
+       if (request_irq(dev->irq, i596_interrupt, 0, "i82596", dev)) {
                printk(KERN_ERR "%s: IRQ %d not free\n", dev->name, dev->irq);
                goto failed;
        }

diff --git a/drivers/net/lp486e.c b/drivers/net/lp486e.c
index cc3ed9cf28be97d52f53109ac674dd2ff8821eb2..e20fefc73c8bb93d61d2d5c7e9741022f520badb 100644 (file)
--- a/drivers/net/lp486e.c
+++ b/drivers/net/lp486e.c
@@ -845,7 +845,7 @@ static int i596_open(struct net_device *dev)
 {
        int i;
 
-       i = request_irq(dev->irq, &i596_interrupt, IRQF_SHARED, dev->name, dev);
+       i = request_irq(dev->irq, i596_interrupt, IRQF_SHARED, dev->name, dev);
        if (i) {
                printk(KERN_ERR "%s: IRQ %d not free\n", dev->name, dev->irq);
                return i;

diff --git a/drivers/net/mac89x0.c b/drivers/net/mac89x0.c
index 149e0ed4a055560f47f3bd99641f6e25f858c053..c244ec34fc436e74d13dccd6485741818c7252df 100644 (file)
--- a/drivers/net/mac89x0.c
+++ b/drivers/net/mac89x0.c
@@ -337,7 +337,7 @@ net_open(struct net_device *dev)
        writereg(dev, PP_BusCTL, readreg(dev, PP_BusCTL) & ~ENABLE_IRQ);
 
        /* Grab the interrupt */
-       if (request_irq(dev->irq, &net_interrupt, 0, "cs89x0", dev))
+       if (request_irq(dev->irq, net_interrupt, 0, "cs89x0", dev))
                return -EAGAIN;
 
        /* Set up the IRQ - Apparently magic */

diff --git a/drivers/net/macsonic.c b/drivers/net/macsonic.c
index b3d7d8d77f465e92a861b7bc5833ef508fb2b0e2..875d361fb79d2063dab239284767eb67607c2429 100644 (file)
--- a/drivers/net/macsonic.c
+++ b/drivers/net/macsonic.c
@@ -140,7 +140,7 @@ static irqreturn_t macsonic_interrupt(int irq, void *dev_id)
 
 static int macsonic_open(struct net_device* dev)
 {
-       if (request_irq(dev->irq, &sonic_interrupt, IRQ_FLG_FAST, "sonic", dev)) {
+       if (request_irq(dev->irq, sonic_interrupt, IRQ_FLG_FAST, "sonic", dev)) {
                printk(KERN_ERR "%s: unable to get IRQ %d.\n", dev->name, dev->irq);
                return -EAGAIN;
        }
@@ -149,7 +149,7 @@ static int macsonic_open(struct net_device* dev)
         * rupt as well, which must prevent re-entrance of the sonic handler.
         */
        if (dev->irq == IRQ_AUTO_3)
-               if (request_irq(IRQ_NUBUS_9, &macsonic_interrupt, IRQ_FLG_FAST, "sonic", dev)) {
+               if (request_irq(IRQ_NUBUS_9, macsonic_interrupt, IRQ_FLG_FAST, "sonic", dev)) {
                        printk(KERN_ERR "%s: unable to get IRQ %d.\n", dev->name, IRQ_NUBUS_9);
                        free_irq(dev->irq, dev);
                        return -EAGAIN;

diff --git a/drivers/net/mipsnet.c b/drivers/net/mipsnet.c
index 8ea98bd89ff1a1fe7b198ce1b341982b4626d724..8e9704f5c12213390923cf77005df3dc63b88dd5 100644 (file)
--- a/drivers/net/mipsnet.c
+++ b/drivers/net/mipsnet.c
@@ -211,7 +211,7 @@ static int mipsnet_open(struct net_device *dev)
 {
        int err;
 
-       err = request_irq(dev->irq, &mipsnet_interrupt,
+       err = request_irq(dev->irq, mipsnet_interrupt,
                          IRQF_SHARED, dev->name, (void *) dev);
        if (err) {
                release_region(dev->base_addr, sizeof(struct mipsnet_regs));

diff --git a/drivers/net/myri_sbus.c b/drivers/net/myri_sbus.c
index 29ebebc6a95bd8b3917fd9425191c6bd4fa7cc6e..b3513ad3b7037eb45b76190b32124b9f7a842dba 100644 (file)
--- 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
 
        /* Register interrupt handler now. */
        DET(("Requesting MYRIcom IRQ line.\n"));
-       if (request_irq(dev->irq, &myri_interrupt,
+       if (request_irq(dev->irq, myri_interrupt,
                        IRQF_SHARED, "MyriCOM Ethernet", (void *) dev)) {
                printk("MyriCOM: Cannot register interrupt handler.\n");
                goto err;

diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index b2722c44337eb5638a67fba137699b4d3b9fc5ef..9a8d3ab4709ba5cf39662ad2c8aa4b41f132ba34 100644 (file)
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -1535,7 +1535,7 @@ static int netdev_open(struct net_device *dev)
        /* Reset the chip, just in case. */
        natsemi_reset(dev);
 
-       i = request_irq(dev->irq, &intr_handler, IRQF_SHARED, dev->name, dev);
+       i = request_irq(dev->irq, intr_handler, IRQF_SHARED, dev->name, dev);
        if (i) return i;
 
        if (netif_msg_ifup(np))

diff --git a/drivers/net/netx-eth.c b/drivers/net/netx-eth.c
index a0d65f592a12dd1f12983a0a8e5f191a836f337f..64770298c4f7121a3a49b3752a25a56b5691b509 100644 (file)
--- 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)
        struct netx_eth_priv *priv = netdev_priv(ndev);
 
        if (request_irq
-           (ndev->irq, &netx_eth_interrupt, IRQF_SHARED, ndev->name, ndev))
+           (ndev->irq, netx_eth_interrupt, IRQF_SHARED, ndev->name, ndev))
                return -EAGAIN;
 
        writel(ndev->dev_addr[0] |

diff --git a/drivers/net/ni5010.c b/drivers/net/ni5010.c
index 462d20f26436bd268215feb14e22a1fa5685e970..6a87d810e59d880ec73de728b487664509471a15 100644 (file)
--- a/drivers/net/ni5010.c
+++ b/drivers/net/ni5010.c
@@ -377,7 +377,7 @@ static int ni5010_open(struct net_device *dev)
 
        PRINTK2((KERN_DEBUG "%s: entering ni5010_open()\n", dev->name));
 
-       if (request_irq(dev->irq, &ni5010_interrupt, 0, boardname, dev)) {
+       if (request_irq(dev->irq, ni5010_interrupt, 0, boardname, dev)) {
                printk(KERN_WARNING "%s: Cannot get irq %#2x\n", dev->name, dev->irq);
                return -EAGAIN;
        }

diff --git a/drivers/net/ni52.c b/drivers/net/ni52.c
index aad3b370c56284ccaa0f97426d0ba681b35c31c1..305f4ba36999c0238001552b9c8cd1343a47353b 100644 (file)
--- a/drivers/net/ni52.c
+++ b/drivers/net/ni52.c
@@ -284,7 +284,7 @@ static int ni52_open(struct net_device *dev)
        startrecv586(dev);
        ni_enaint();
 
-       ret = request_irq(dev->irq, &ni52_interrupt, 0, dev->name, dev);
+       ret = request_irq(dev->irq, ni52_interrupt, 0, dev->name, dev);
        if (ret) {
                ni_reset586();
                return ret;

diff --git a/drivers/net/ni65.c b/drivers/net/ni65.c
index 752c2e4d9cf4a483f1166e565631ee32cc19bd88..ae19aafd2c7e619cf71673286a28a7b20ea48d14 100644 (file)
--- a/drivers/net/ni65.c
+++ b/drivers/net/ni65.c
@@ -294,7 +294,7 @@ static void ni65_set_performance(struct priv *p)
 static int ni65_open(struct net_device *dev)
 {
        struct priv *p = dev->ml_priv;
-       int irqval = request_irq(dev->irq, &ni65_interrupt,0,
+       int irqval = request_irq(dev->irq, ni65_interrupt,0,
                         cards[p->cardno].cardname,dev);
        if (irqval) {
                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 c254a7f5b9f5bf6344f1318011bba5f817d677ac..1673eb045e1e650c8373eb20ec894ed010d787ae 100644 (file)
--- 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)
        snprintf(mac->tx_irq_name, sizeof(mac->tx_irq_name), "%s tx",
                 dev->name);
 
-       ret = request_irq(mac->tx->chan.irq, &pasemi_mac_tx_intr, IRQF_DISABLED,
+       ret = request_irq(mac->tx->chan.irq, pasemi_mac_tx_intr, IRQF_DISABLED,
                          mac->tx_irq_name, mac->tx);
        if (ret) {
                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)
        snprintf(mac->rx_irq_name, sizeof(mac->rx_irq_name), "%s rx",
                 dev->name);
 
-       ret = request_irq(mac->rx->chan.irq, &pasemi_mac_rx_intr, IRQF_DISABLED,
+       ret = request_irq(mac->rx->chan.irq, pasemi_mac_rx_intr, IRQF_DISABLED,
                          mac->rx_irq_name, mac->rx);
        if (ret) {
                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 c1b3f09f452c5450bcc42c1983099293055077bd..076f23a10517f45938e6a5764c5178d5189b61df 100644 (file)
--- a/drivers/net/pcnet32.c
+++ b/drivers/net/pcnet32.c
@@ -2095,7 +2095,7 @@ static int pcnet32_open(struct net_device *dev)
        int rc;
        unsigned long flags;
 
-       if (request_irq(dev->irq, &pcnet32_interrupt,
+       if (request_irq(dev->irq, pcnet32_interrupt,
                        lp->shared_irq ? IRQF_SHARED : 0, dev->name,
                        (void *)dev)) {
                return -EAGAIN;

diff --git a/drivers/net/s6gmac.c b/drivers/net/s6gmac.c
index 4525cbe8dd69c0dd2585568eb28555b6ff2205b9..d81706e91aa7dacc781bbc743c49abae60d554e2 100644 (file)
--- a/drivers/net/s6gmac.c
+++ b/drivers/net/s6gmac.c
@@ -984,7 +984,7 @@ static int __devinit s6gmac_probe(struct platform_device *pdev)
        pd->rx_dma = DMA_MASK_DMAC(i);
        pd->rx_chan = DMA_INDEX_CHNL(i);
        pd->io = platform_get_resource(pdev, IORESOURCE_IO, 0)->start;
-       res = request_irq(dev->irq, &s6gmac_interrupt, 0, dev->name, dev);
+       res = request_irq(dev->irq, s6gmac_interrupt, 0, dev->name, dev);
        if (res) {
                printk(KERN_ERR DRV_PRMT "irq request failed: %d\n", dev->irq);
                goto errirq;

diff --git a/drivers/net/sb1000.c b/drivers/net/sb1000.c
index c9c70ab0cce0c738989a1a6b32e6831af40ba2d7..9f83a11973750a2711eee50e7b985af5159c5cec 100644 (file)
--- a/drivers/net/sb1000.c
+++ b/drivers/net/sb1000.c
@@ -973,7 +973,7 @@ sb1000_open(struct net_device *dev)
        lp->rx_frame_id[1] = 0;
        lp->rx_frame_id[2] = 0;
        lp->rx_frame_id[3] = 0;
-       if (request_irq(dev->irq, &sb1000_interrupt, 0, "sb1000", dev)) {
+       if (request_irq(dev->irq, sb1000_interrupt, 0, "sb1000", dev)) {
                return -EAGAIN;
        }
 

diff --git a/drivers/net/sb1250-mac.c b/drivers/net/sb1250-mac.c
index 7269a875326eefb7b507043563d091b5080fec86..564d4d7f855b163c3e937925e3e49a7e335c293c 100644 (file)
--- a/drivers/net/sb1250-mac.c
+++ b/drivers/net/sb1250-mac.c
@@ -2410,7 +2410,7 @@ static int sbmac_open(struct net_device *dev)
         */
 
        __raw_readq(sc->sbm_isr);
-       err = request_irq(dev->irq, &sbmac_intr, IRQF_SHARED, dev->name, dev);
+       err = request_irq(dev->irq, sbmac_intr, IRQF_SHARED, dev->name, dev);
        if (err) {
                printk(KERN_ERR "%s: unable to get IRQ %d\n", dev->name,
                       dev->irq);

diff --git a/drivers/net/seeq8005.c b/drivers/net/seeq8005.c
index 39246d457ac2020cb94dea9e3a901cab4b8d5a8d..fe806bd9b95f662e3093f024cd087f525f701629 100644 (file)
--- 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)
 
 #if 0
        {
-                int irqval = request_irq(dev->irq, &seeq8005_interrupt, 0, "seeq8005", dev);
+                int irqval = request_irq(dev->irq, seeq8005_interrupt, 0, "seeq8005", dev);
                 if (irqval) {
                         printk ("%s: unable to get IRQ %d (irqval=%d).\n", dev->name,
                                         dev->irq, irqval);
@@ -367,7 +367,7 @@ static int seeq8005_open(struct net_device *dev)
        struct net_local *lp = netdev_priv(dev);
 
        {
-                int irqval = request_irq(dev->irq, &seeq8005_interrupt, 0, "seeq8005", dev);
+                int irqval = request_irq(dev->irq, seeq8005_interrupt, 0, "seeq8005", dev);
                 if (irqval) {
                         printk ("%s: unable to get IRQ %d (irqval=%d).\n", dev->name,
                                         dev->irq, irqval);

diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 5783f50d18e988438a9a02e247b4e17ec8b6a9c9..c88bc1013047573b9945658970ffd06b082389f0 100644 (file)
--- 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)
 
        pm_runtime_get_sync(&mdp->pdev->dev);
 
-       ret = request_irq(ndev->irq, &sh_eth_interrupt,
+       ret = request_irq(ndev->irq, sh_eth_interrupt,
 #if defined(CONFIG_CPU_SUBTYPE_SH7763) || defined(CONFIG_CPU_SUBTYPE_SH7764)
                                IRQF_SHARED,
 #else

diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c
index c072f7f36acfd7d5cb02b727557ea0fe4ee1e562..9a12d88ac2d9cfb9750be65e64ac6ba298ccb4c5 100644 (file)
--- a/drivers/net/sis900.c
+++ b/drivers/net/sis900.c
@@ -1016,7 +1016,7 @@ sis900_open(struct net_device *net_dev)
        /* Equalizer workaround Rule */
        sis630_set_eq(net_dev, sis_priv->chipset_rev);
 
-       ret = request_irq(net_dev->irq, &sis900_interrupt, IRQF_SHARED,
+       ret = request_irq(net_dev->irq, sis900_interrupt, IRQF_SHARED,
                                                net_dev->name, net_dev);
        if (ret)
                return ret;

diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 2a6b6de953399f3daaec6350f716de67b0064bf1..44ebbaa7457bbaeb4a9633256f98f879280e79a1 100644 (file)
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -1984,7 +1984,7 @@ static int __devinit smc911x_probe(struct net_device *dev)
 #endif
 
        /* Grab the IRQ */
-       retval = request_irq(dev->irq, &smc911x_interrupt,
+       retval = request_irq(dev->irq, smc911x_interrupt,
                             irq_flags, dev->name, dev);
        if (retval)
                goto err_out;

diff --git a/drivers/net/smc9194.c b/drivers/net/smc9194.c
index 934a120128292b5a4304de164fdf7bc0a65cf16f..8371b82323ac68795b6f6199142eb3a2243589ca 100644 (file)
--- 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)
        memset(netdev_priv(dev), 0, sizeof(struct smc_local));
 
        /* Grab the IRQ */
-       retval = request_irq(dev->irq, &smc_interrupt, 0, DRV_NAME, dev);
+       retval = request_irq(dev->irq, smc_interrupt, 0, DRV_NAME, dev);
        if (retval) {
                printk("%s: unable to get IRQ %d (irqval=%d).\n", DRV_NAME,
                        dev->irq, retval);

diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
index 05c91ee6921e8a2082ed605db93f3ddb92581b27..0b56ab468d28d8215fa40879c74548813b5a0652 100644 (file)
--- 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,
        }
 
        /* Grab the IRQ */
-       retval = request_irq(dev->irq, &smc_interrupt, irq_flags, dev->name, dev);
+       retval = request_irq(dev->irq, smc_interrupt, irq_flags, dev->name, dev);
        if (retval)
                goto err_out;
 

diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c
index a36e2b51e88cfa9b1a6ac0a72937f2c4be4b59e4..aa10158adb9e84293569e41668262c2338552a07 100644 (file)
--- a/drivers/net/starfire.c
+++ b/drivers/net/starfire.c
@@ -928,7 +928,7 @@ static int netdev_open(struct net_device *dev)
 
        /* Do we ever need to reset the chip??? */
 
-       retval = request_irq(dev->irq, &intr_handler, IRQF_SHARED, dev->name, dev);
+       retval = request_irq(dev->irq, intr_handler, IRQF_SHARED, dev->name, dev);
        if (retval)
                return retval;
 

diff --git a/drivers/net/stmmac/stmmac_main.c b/drivers/net/stmmac/stmmac_main.c
index c2f14dc9ba289df6839fad9e9e7eec98c395cf21..e961e7593c1fa307600783b44b551cd3ba4b45b3 100644 (file)
--- 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)
        }
 
        /* Request the IRQ lines */
-       ret = request_irq(dev->irq, &stmmac_interrupt,
+       ret = request_irq(dev->irq, stmmac_interrupt,
                          IRQF_SHARED, dev->name, dev);
        if (unlikely(ret < 0)) {
                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 2f1eaaf7a727a29950c6efc09d221eed1edb328d..b447a8719427429738aa3a3605ffcca79e2c19d9 100644 (file)
--- 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)
        startrecv586(dev);
        sun3_enaint();
 
-       ret = request_irq(dev->irq, &sun3_82586_interrupt,0,dev->name,dev);
+       ret = request_irq(dev->irq, sun3_82586_interrupt,0,dev->name,dev);
        if (ret)
        {
                sun3_reset586();

diff --git a/drivers/net/sunbmac.c b/drivers/net/sunbmac.c
index 536cf7e06bfde4bacdd47a76a9c79f7b2629ea82..25e81ebd9cd82b42aac9d2d9e32d9ae384a40b53 100644 (file)
--- a/drivers/net/sunbmac.c
+++ b/drivers/net/sunbmac.c
@@ -919,7 +919,7 @@ static int bigmac_open(struct net_device *dev)
        struct bigmac *bp = netdev_priv(dev);
        int ret;
 
-       ret = request_irq(dev->irq, &bigmac_interrupt, IRQF_SHARED, dev->name, bp);
+       ret = request_irq(dev->irq, bigmac_interrupt, IRQF_SHARED, dev->name, bp);
        if (ret) {
                printk(KERN_ERR "BIGMAC: Can't order irq %d to go.\n", dev->irq);
                return ret;

diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c
index e13685a570f401b0276c7db0691eff20b5024fe3..5c396c2e6e769f8bfa0f761976247878dc86ac6a 100644 (file)
--- a/drivers/net/sundance.c
+++ b/drivers/net/sundance.c
@@ -819,7 +819,7 @@ static int netdev_open(struct net_device *dev)
 
        /* Do we need to reset the chip??? */
 
-       i = request_irq(dev->irq, &intr_handler, IRQF_SHARED, dev->name, dev);
+       i = request_irq(dev->irq, intr_handler, IRQF_SHARED, dev->name, dev);
        if (i)
                return i;
 

diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index 37d721bbdb3532abf4a8919dca1b085e79226145..1f842a78acd137083ae8544d80fe8a45188a6e09 100644 (file)
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -2184,7 +2184,7 @@ static int happy_meal_open(struct net_device *dev)
         * into a single source which we register handling at probe time.
         */
        if ((hp->happy_flags & (HFLAG_QUATTRO|HFLAG_PCI)) != HFLAG_QUATTRO) {
-               if (request_irq(dev->irq, &happy_meal_interrupt,
+               if (request_irq(dev->irq, happy_meal_interrupt,
                                IRQF_SHARED, dev->name, (void *)dev)) {
                        HMD(("EAGAIN\n"));
                        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 9d6fd4760eab0082a5b58c8087b588531be983eb..64e7d08c878ff1f337ac1ca9fac88603b0eb2fe3 100644 (file)
--- a/drivers/net/sunlance.c
+++ b/drivers/net/sunlance.c
@@ -923,7 +923,7 @@ static int lance_open(struct net_device *dev)
 
        STOP_LANCE(lp);
 
-       if (request_irq(dev->irq, &lance_interrupt, IRQF_SHARED,
+       if (request_irq(dev->irq, lance_interrupt, IRQF_SHARED,
                        lancestr, (void *) dev)) {
                printk(KERN_ERR "Lance: Can't get irq %d\n", dev->irq);
                return -EAGAIN;

diff --git a/drivers/net/sunqe.c b/drivers/net/sunqe.c
index dcefb608a9f44587632067eba05f9b238b4660a3..45c383f285eebd9b38b066c11d7a8f92e4736dc6 100644 (file)
--- a/drivers/net/sunqe.c
+++ b/drivers/net/sunqe.c
@@ -807,7 +807,7 @@ static struct sunqec * __devinit get_qec(struct of_device *child)
 
                        qec_init_once(qecp, op);
 
-                       if (request_irq(op->irqs[0], &qec_interrupt,
+                       if (request_irq(op->irqs[0], qec_interrupt,
                                        IRQF_SHARED, "qec", (void *) qecp)) {
                                printk(KERN_ERR "qec: Can't register irq.\n");
                                goto fail;

diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c
index 6572e8a5452018bc230102748e45b81d469e8050..75a669d48e5ebc4be3d79b84ee09ff7a50d85845 100644 (file)
--- a/drivers/net/tc35815.c
+++ b/drivers/net/tc35815.c
@@ -1248,7 +1248,7 @@ tc35815_open(struct net_device *dev)
         * This is used if the interrupt line can turned off (shared).
         * See 3c503.c for an example of selecting the IRQ at config-time.
         */
-       if (request_irq(dev->irq, &tc35815_interrupt, IRQF_SHARED,
+       if (request_irq(dev->irq, tc35815_interrupt, IRQF_SHARED,
                        dev->name, dev))
                return -EAGAIN;
 

diff --git a/drivers/net/tehuti.c b/drivers/net/tehuti.c
index 492bff68bf2dd35d71434d2a68861d9e90373630..2fbac31767faf8665e985061d735de2153d3d973 100644 (file)
--- a/drivers/net/tehuti.c
+++ b/drivers/net/tehuti.c
@@ -420,7 +420,7 @@ static int bdx_hw_start(struct bdx_priv *priv)
                  GMAC_RX_FILTER_AM | GMAC_RX_FILTER_AB);
 
 #define BDX_IRQ_TYPE   ((priv->nic->irq_type == IRQ_MSI)?0:IRQF_SHARED)
-       if ((rc = request_irq(priv->pdev->irq, &bdx_isr_napi, BDX_IRQ_TYPE,
+       if ((rc = request_irq(priv->pdev->irq, bdx_isr_napi, BDX_IRQ_TYPE,
                         ndev->name, ndev)))
                goto err_irq;
        bdx_enable_interrupts(priv);

diff --git a/drivers/net/tokenring/ibmtr.c b/drivers/net/tokenring/ibmtr.c
index 75fa32e34fd00df30c9f8c009fc53449b44f0288..5db0270957ac910e0eac68280f28c71d43c89471 100644 (file)
--- 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)
 
        /* The PCMCIA has already got the interrupt line and the io port, 
           so no chance of anybody else getting it - MLP */
-       if (request_irq(dev->irq = irq, &tok_interrupt, 0, "ibmtr", dev) != 0) {
+       if (request_irq(dev->irq = irq, tok_interrupt, 0, "ibmtr", dev) != 0) {
                DPRINTK("Could not grab irq %d.  Halting Token Ring driver.\n",
                                        irq);
                iounmap(t_mmio);

diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c
index 26dca2b2bdbdbddb6c32262e3fd964bee331315a..7b1fe9412b6f154630358437bf91d61ee1b758db 100644 (file)
--- a/drivers/net/tokenring/lanstreamer.c
+++ b/drivers/net/tokenring/lanstreamer.c
@@ -596,7 +596,7 @@ static int streamer_open(struct net_device *dev)
                rc=streamer_reset(dev);
        }
 
-       if (request_irq(dev->irq, &streamer_interrupt, IRQF_SHARED, "lanstreamer", dev)) {
+       if (request_irq(dev->irq, streamer_interrupt, IRQF_SHARED, "lanstreamer", dev)) {
                return -EAGAIN;
        }
 #if STREAMER_DEBUG

diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
index a45ded0538b84db192a1d2ff6bbc3ce1eb1ad0f3..ad63621913c3c459a046ddcc39d7577f031a9d4d 100644 (file)
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@ -543,7 +543,7 @@ static int dmfe_open(struct DEVICE *dev)
 
        DMFE_DBUG(0, "dmfe_open", 0);
 
-       ret = request_irq(dev->irq, &dmfe_interrupt,
+       ret = request_irq(dev->irq, dmfe_interrupt,
                          IRQF_SHARED, dev->name, dev);
        if (ret)
                return ret;

diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index 6b2330e4206e12467c7e28c08e155a4c5bccf668..0df983bc03a6d7b26a0d06f21474ebd8a5841708 100644 (file)
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -506,7 +506,7 @@ tulip_open(struct net_device *dev)
 
        tulip_init_ring (dev);
 
-       retval = request_irq(dev->irq, &tulip_interrupt, IRQF_SHARED, dev->name, dev);
+       retval = request_irq(dev->irq, tulip_interrupt, IRQF_SHARED, dev->name, dev);
        if (retval)
                goto free_ring;
 
@@ -1782,7 +1782,7 @@ static int tulip_resume(struct pci_dev *pdev)
                return retval;
        }
 
-       if ((retval = request_irq(dev->irq, &tulip_interrupt, IRQF_SHARED, dev->name, dev))) {
+       if ((retval = request_irq(dev->irq, tulip_interrupt, IRQF_SHARED, dev->name, dev))) {
                printk (KERN_ERR "tulip: request_irq failed in resume\n");
                return retval;
        }

diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c
index c457a0ca55ad56ddd684c18b0f8ad4b53a7190ad..fa019cabc355579baa1df2bab18e0ed774c4c65d 100644 (file)
--- a/drivers/net/tulip/uli526x.c
+++ b/drivers/net/tulip/uli526x.c
@@ -461,7 +461,7 @@ static int uli526x_open(struct net_device *dev)
        /* Initialize ULI526X board */
        uli526x_init(dev);
 
-       ret = request_irq(dev->irq, &uli526x_interrupt, IRQF_SHARED, dev->name, dev);
+       ret = request_irq(dev->irq, uli526x_interrupt, IRQF_SHARED, dev->name, dev);
        if (ret)
                return ret;
 

diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
index b38d3b7f6e35dd9be780efc2b5a11ae8ee974c4c..1a52729c9466aea3c8be3f1bf64b7cd39c717996 100644 (file)
--- 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)
        iowrite32(0x00000001, ioaddr + PCIBusCfg);              /* Reset */
 
        netif_device_detach(dev);
-       i = request_irq(dev->irq, &intr_handler, IRQF_SHARED, dev->name, dev);
+       i = request_irq(dev->irq, intr_handler, IRQF_SHARED, dev->name, dev);
        if (i)
                goto out_err;
 

diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c
index 0f2ca5980c3c19981f2926d5474ce490b00d5dfd..9924c4c7e2d6b0b47fa1474b38e513d556f9aa18 100644 (file)
--- 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)
        int retval;
        enter("xircom_open");
        printk(KERN_INFO "xircom cardbus adaptor found, registering as %s, using irq %i \n",dev->name,dev->irq);
-       retval = request_irq(dev->irq, &xircom_interrupt, IRQF_SHARED, dev->name, dev);
+       retval = request_irq(dev->irq, xircom_interrupt, IRQF_SHARED, dev->name, dev);
        if (retval) {
                leave("xircom_open - No IRQ");
                return retval;

diff --git a/drivers/net/wan/hostess_sv11.c b/drivers/net/wan/hostess_sv11.c
index 15002c3d0d95298711a1f6543af32e2d052d788d..74164d29524c92be79f490861fb3bf9ea39711ee 100644 (file)
--- 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)
        /* We want a fast IRQ for this device. Actually we'd like an even faster
           IRQ ;) - This is one driver RtLinux is made for */
 
-       if (request_irq(irq, &z8530_interrupt, IRQF_DISABLED,
+       if (request_irq(irq, z8530_interrupt, IRQF_DISABLED,
                        "Hostess SV11", sv) < 0) {
                printk(KERN_WARNING "hostess: IRQ %d already in use.\n", irq);
                goto err_irq;

diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c
index 7ea71b33d2e9b40227511822c27d74d897495646..2ebe935d10585ef4b3d792c78c98c2f6329248d9 100644 (file)
--- 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)
     lmc_softreset (sc);
 
     /* Since we have to use PCI bus, this should work on x86,alpha,ppc */
-    if (request_irq (dev->irq, &lmc_interrupt, IRQF_SHARED, dev->name, dev)){
+    if (request_irq (dev->irq, lmc_interrupt, IRQF_SHARED, dev->name, dev)){
         printk(KERN_WARNING "%s: could not get irq: %d\n", dev->name, dev->irq);
         lmc_trace(dev, "lmc_open irq failed out");
         return -EAGAIN;

diff --git a/drivers/net/wan/n2.c b/drivers/net/wan/n2.c
index 58c66819f39b161f6b7d4bde9e3fd400ea4e42b6..5394b51bdb2f768f36d3d4ac705d46abc23b7187 100644 (file)
--- 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,
        }
        card->io = io;
 
-       if (request_irq(irq, &sca_intr, 0, devname, card)) {
+       if (request_irq(irq, sca_intr, 0, devname, card)) {
                printk(KERN_ERR "n2: could not allocate IRQ\n");
                n2_destroy_card(card);
                return(-EBUSY);

diff --git a/drivers/net/wan/sdla.c b/drivers/net/wan/sdla.c
index 2b15a7e40d5b4de77965b2aa4c2d0c746fbd3e8a..31c41af2246d6cb4c5926ac7f7cec43b4e71c273 100644 (file)
--- a/drivers/net/wan/sdla.c
+++ b/drivers/net/wan/sdla.c
@@ -1457,7 +1457,7 @@ got_type:
        }
 
        err = -EAGAIN;
-       if (request_irq(dev->irq, &sdla_isr, 0, dev->name, dev)) 
+       if (request_irq(dev->irq, sdla_isr, 0, dev->name, dev)) 
                goto fail;
 
        if (flp->type == SDLA_S507) {

diff --git a/drivers/net/wan/sealevel.c b/drivers/net/wan/sealevel.c
index 0c525e24b247242d5337b63636e5712e8d493595..3b3ee05bc462f3155c4f3fa48a67e065039cddb3 100644 (file)
--- 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,
        /* We want a fast IRQ for this device. Actually we'd like an even faster
           IRQ ;) - This is one driver RtLinux is made for */
 
-       if (request_irq(irq, &z8530_interrupt, IRQF_DISABLED,
+       if (request_irq(irq, z8530_interrupt, IRQF_DISABLED,
                        "SeaLevel", dev) < 0) {
                printk(KERN_WARNING "sealevel: IRQ %d already in use.\n", irq);
                goto err_request_irq;

diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index 9e64dd43a3be01c93728a7ab2c9c9cf8cc0fbc12..0cb5ecc822a8e34544fc3ff861d629e4a8d7a745 100644 (file)
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -2817,7 +2817,7 @@ static int mwl8k_start(struct ieee80211_hw *hw)
        struct mwl8k_priv *priv = hw->priv;
        int rc;
 
-       rc = request_irq(priv->pdev->irq, &mwl8k_interrupt,
+       rc = request_irq(priv->pdev->irq, mwl8k_interrupt,
                         IRQF_SHARED, MWL8K_NAME, hw);
        if (rc) {
                printk(KERN_ERR "%s: failed to register IRQ handler\n",
@@ -3482,7 +3482,7 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
        iowrite32(0, priv->regs + MWL8K_HIU_A2H_INTERRUPT_CLEAR_SEL);
        iowrite32(0xffffffff, priv->regs + MWL8K_HIU_A2H_INTERRUPT_STATUS_MASK);
 
-       rc = request_irq(priv->pdev->irq, &mwl8k_interrupt,
+       rc = request_irq(priv->pdev->irq, mwl8k_interrupt,
                         IRQF_SHARED, MWL8K_NAME, hw);
        if (rc) {
                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 83d366258c81e4b84dbe765dd946b04b5bf2abb0..e4f2bb7368f27c598f7a40901f79028a83b5ab78 100644 (file)
--- 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)
        isl38xx_disable_interrupts(priv->device_base);
 
        /* request for the interrupt before uploading the firmware */
-       rvalue = request_irq(pdev->irq, &islpci_interrupt,
+       rvalue = request_irq(pdev->irq, islpci_interrupt,
                             IRQF_SHARED, ndev->name, priv);
 
        if (rvalue) {

diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c
index 83a044dbd1d775dc9a3c88d39c2091c42b01ff36..8c777ba4e2b39868676e267136efb6ec075b5799 100644 (file)
--- a/drivers/net/xilinx_emaclite.c
+++ b/drivers/net/xilinx_emaclite.c
@@ -660,7 +660,7 @@ static int xemaclite_open(struct net_device *dev)
        xemaclite_set_mac_address(lp, dev->dev_addr);
 
        /* Grab the IRQ */
-       retval = request_irq(dev->irq, &xemaclite_interrupt, 0, dev->name, dev);
+       retval = request_irq(dev->irq, xemaclite_interrupt, 0, dev->name, dev);
        if (retval) {
                dev_err(&lp->ndev->dev, "Could not allocate interrupt %d\n",
                        dev->irq);

diff --git a/drivers/net/xtsonic.c b/drivers/net/xtsonic.c
index 0c44135c0b1fd4d0d4888a67e33f20f765461ed5..389ba9df71206a12f933b3b5931499c8a6b3337e 100644 (file)
--- a/drivers/net/xtsonic.c
+++ b/drivers/net/xtsonic.c
@@ -92,7 +92,7 @@ static unsigned short known_revisions[] =
 
 static int xtsonic_open(struct net_device *dev)
 {
-       if (request_irq(dev->irq,&sonic_interrupt,IRQF_DISABLED,"sonic",dev)) {
+       if (request_irq(dev->irq,sonic_interrupt,IRQF_DISABLED,"sonic",dev)) {
                printk(KERN_ERR "%s: unable to get IRQ %d.\n",
                       dev->name, dev->irq);
                return -EAGAIN;

diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c
index 40ad0dee0406a465bf3bcc15b5c120322e0f81c1..d831dfca0976bc1cf8cb5a4c0532a4dd2ec57ed7 100644 (file)
--- a/drivers/net/yellowfin.c
+++ b/drivers/net/yellowfin.c
@@ -579,7 +579,7 @@ static int yellowfin_open(struct net_device *dev)
        /* Reset the chip. */
        iowrite32(0x80000000, ioaddr + DMACtrl);
 
-       ret = request_irq(dev->irq, &yellowfin_interrupt, IRQF_SHARED, dev->name, dev);
+       ret = request_irq(dev->irq, yellowfin_interrupt, IRQF_SHARED, dev->name, dev);
        if (ret)
                return ret;
 

diff --git a/drivers/net/znet.c b/drivers/net/znet.c
index 443c4eee28c1e15bfddd5452bce50a1388ec1894..a97d894d26fb441c29ec630a04e07218efaf1219 100644 (file)
--- a/drivers/net/znet.c
+++ b/drivers/net/znet.c
@@ -169,7 +169,7 @@ static int znet_request_resources (struct net_device *dev)
 {
        struct znet_private *znet = netdev_priv(dev);
 
-       if (request_irq (dev->irq, &znet_interrupt, 0, "ZNet", dev))
+       if (request_irq (dev->irq, znet_interrupt, 0, "ZNet", dev))
                goto failed;
        if (request_dma (znet->rx_dma, "ZNet rx"))
                goto free_irq;