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/ixgbe | |
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/ixgbe')
-rw-r--r-- | drivers/net/ixgbe/ixgbe_ethtool.c | 6 | ||||
-rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 6 |
2 files changed, 6 insertions, 6 deletions
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 | ||