drivers/net: request_irq - Remove unnecessary leading & from second arg

[deliverable/linux.git] / drivers / net / e1000e / netdev.c

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