aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/atlx
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2010-08-23 14:20:03 -0400
committerDavid S. Miller <davem@davemloft.net>2010-08-25 18:35:43 -0400
commitc061b18df0f1fe3f50fe451dbbdc9ede3c19701a (patch)
tree91508aff083ab7a93d1e7f3b6eb933059d1a2776 /drivers/net/atlx
parent31018e068edb9eed740bec5cf14802c3c676c9ee (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/atlx')
-rw-r--r--drivers/net/atlx/atl1.c2
-rw-r--r--drivers/net/atlx/atl2.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c
index 63b9ba0cc67e..5837b0184d4b 100644
--- a/drivers/net/atlx/atl1.c
+++ b/drivers/net/atlx/atl1.c
@@ -3036,7 +3036,7 @@ static int __devinit atl1_probe(struct pci_dev *pdev,
3036 netif_carrier_off(netdev); 3036 netif_carrier_off(netdev);
3037 netif_stop_queue(netdev); 3037 netif_stop_queue(netdev);
3038 3038
3039 setup_timer(&adapter->phy_config_timer, &atl1_phy_config, 3039 setup_timer(&adapter->phy_config_timer, atl1_phy_config,
3040 (unsigned long)adapter); 3040 (unsigned long)adapter);
3041 adapter->phy_timer_pending = false; 3041 adapter->phy_timer_pending = false;
3042 3042
diff --git a/drivers/net/atlx/atl2.c b/drivers/net/atlx/atl2.c
index 8da87383fb39..07adc8446901 100644
--- a/drivers/net/atlx/atl2.c
+++ b/drivers/net/atlx/atl2.c
@@ -1444,11 +1444,11 @@ static int __devinit atl2_probe(struct pci_dev *pdev,
1444 atl2_check_options(adapter); 1444 atl2_check_options(adapter);
1445 1445
1446 init_timer(&adapter->watchdog_timer); 1446 init_timer(&adapter->watchdog_timer);
1447 adapter->watchdog_timer.function = &atl2_watchdog; 1447 adapter->watchdog_timer.function = atl2_watchdog;
1448 adapter->watchdog_timer.data = (unsigned long) adapter; 1448 adapter->watchdog_timer.data = (unsigned long) adapter;
1449 1449
1450 init_timer(&adapter->phy_config_timer); 1450 init_timer(&adapter->phy_config_timer);
1451 adapter->phy_config_timer.function = &atl2_phy_config; 1451 adapter->phy_config_timer.function = atl2_phy_config;
1452 adapter->phy_config_timer.data = (unsigned long) adapter; 1452 adapter->phy_config_timer.data = (unsigned long) adapter;
1453 1453
1454 INIT_WORK(&adapter->reset_task, atl2_reset_task); 1454 INIT_WORK(&adapter->reset_task, atl2_reset_task);