diff options
author | Joe Perches <joe@perches.com> | 2010-08-23 14:20:03 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-08-25 18:35:43 -0400 |
commit | c061b18df0f1fe3f50fe451dbbdc9ede3c19701a (patch) | |
tree | 91508aff083ab7a93d1e7f3b6eb933059d1a2776 /drivers/net/ixgbe | |
parent | 31018e068edb9eed740bec5cf14802c3c676c9ee (diff) |
drivers/net: Remove address use from assignments of function pointers
"foo = &function" is more commonly written "foo = function"
Done with coccinelle script:
// <smpl>
@r@
identifier f;
@@
f(...) { ... }
@@
identifier r.f;
@@
- &f
+ f
// </smpl>
drivers/net/tehuti.c used a function and struct with the
same name, the function was renamed.
Compile tested x86 only.
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_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 18163e312a39..5e4dc1b0a1bd 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c | |||
@@ -6730,7 +6730,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, | |||
6730 | * which might start the timer | 6730 | * which might start the timer |
6731 | */ | 6731 | */ |
6732 | init_timer(&adapter->sfp_timer); | 6732 | init_timer(&adapter->sfp_timer); |
6733 | adapter->sfp_timer.function = &ixgbe_sfp_timer; | 6733 | adapter->sfp_timer.function = ixgbe_sfp_timer; |
6734 | adapter->sfp_timer.data = (unsigned long) adapter; | 6734 | adapter->sfp_timer.data = (unsigned long) adapter; |
6735 | 6735 | ||
6736 | INIT_WORK(&adapter->sfp_task, ixgbe_sfp_task); | 6736 | INIT_WORK(&adapter->sfp_task, ixgbe_sfp_task); |
@@ -6862,7 +6862,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, | |||
6862 | hw->mac.ops.disable_tx_laser(hw); | 6862 | hw->mac.ops.disable_tx_laser(hw); |
6863 | 6863 | ||
6864 | init_timer(&adapter->watchdog_timer); | 6864 | init_timer(&adapter->watchdog_timer); |
6865 | adapter->watchdog_timer.function = &ixgbe_watchdog; | 6865 | adapter->watchdog_timer.function = ixgbe_watchdog; |
6866 | adapter->watchdog_timer.data = (unsigned long)adapter; | 6866 | adapter->watchdog_timer.data = (unsigned long)adapter; |
6867 | 6867 | ||
6868 | INIT_WORK(&adapter->reset_task, ixgbe_reset_task); | 6868 | INIT_WORK(&adapter->reset_task, ixgbe_reset_task); |