diff options
| author |   Julia Lawall <julia.lawall@lip6.fr> | 2014-12-26 15:35:35 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-12-30 18:34:23 -0500 |
| commit | cc73e41f17be97eb4e387610bd95e952127e3216 (patch) | |
| tree | 06c7dc4e267d27397a90c9431cc556d61d6f9106 /drivers/net/ethernet/atheros/atl1e | |
| parent | atheros: atlx: Use setup_timer (diff) | |
| download | linux-dev-cc73e41f17be97eb4e387610bd95e952127e3216.tar.xz linux-dev-cc73e41f17be97eb4e387610bd95e952127e3216.zip | |
atl1e: Use setup_timer
Convert a call to init_timer and accompanying intializations of
the timer's data and function fields to a call to setup_timer.
A simplified version of the semantic match that fixes this problem is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@@
expression t,f,d;
@@
-init_timer(&t);
+setup_timer(&t,f,d);
-t.function = f;
-t.data = d;
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/atheros/atl1e')
| -rw-r--r-- | drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c index 2326579f9454..c88abf5b6415 100644 --- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c +++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c @@ -2373,9 +2373,8 @@ static int atl1e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) netif_napi_add(netdev, &adapter->napi, atl1e_clean, 64); - init_timer(&adapter->phy_config_timer); - adapter->phy_config_timer.function = atl1e_phy_config; - adapter->phy_config_timer.data = (unsigned long) adapter; + setup_timer(&adapter->phy_config_timer, atl1e_phy_config, + (unsigned long)adapter); /* get user settings */ atl1e_check_options(adapter); |