aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/igb
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2009-11-19 02:29:17 -0500
committerDavid S. Miller <davem@davemloft.net>2009-11-19 02:29:17 -0500
commita0607fd3a25ba1848a63a0d925e36d914735ab47 (patch)
treec9bbdf40c9ded30af844e80870a7180ce0c0cb5c /drivers/net/igb
parent2939e275994977b6c9eb7fd082b7b0caa35b96b0 (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/igb')
-rw-r--r--drivers/net/igb/igb_ethtool.c8
-rw-r--r--drivers/net/igb/igb_main.c8
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/igb/igb_ethtool.c b/drivers/net/igb/igb_ethtool.c
index 88e13f7e566..2e238bfa1f9 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 0cab5e2b089..958305e92d6 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)