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>

2 files changed, 8 insertions, 8 deletions

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)
                 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 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)
         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);