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/e1000e | |
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/e1000e')
-rw-r--r-- | drivers/net/e1000e/netdev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 2b8ef44bd2b1..5f3eac6432cb 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c | |||
@@ -5745,11 +5745,11 @@ static int __devinit e1000_probe(struct pci_dev *pdev, | |||
5745 | } | 5745 | } |
5746 | 5746 | ||
5747 | init_timer(&adapter->watchdog_timer); | 5747 | init_timer(&adapter->watchdog_timer); |
5748 | adapter->watchdog_timer.function = &e1000_watchdog; | 5748 | adapter->watchdog_timer.function = e1000_watchdog; |
5749 | adapter->watchdog_timer.data = (unsigned long) adapter; | 5749 | adapter->watchdog_timer.data = (unsigned long) adapter; |
5750 | 5750 | ||
5751 | init_timer(&adapter->phy_info_timer); | 5751 | init_timer(&adapter->phy_info_timer); |
5752 | adapter->phy_info_timer.function = &e1000_update_phy_info; | 5752 | adapter->phy_info_timer.function = e1000_update_phy_info; |
5753 | adapter->phy_info_timer.data = (unsigned long) adapter; | 5753 | adapter->phy_info_timer.data = (unsigned long) adapter; |
5754 | 5754 | ||
5755 | INIT_WORK(&adapter->reset_task, e1000_reset_task); | 5755 | INIT_WORK(&adapter->reset_task, e1000_reset_task); |