Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0e520ef authored by Julia Lawall's avatar Julia Lawall Committed by David S. Miller
Browse files

atheros: atlx: 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: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5115ec96

drivers/net/ethernet/atheros/atlx/atl2.c

+4 −6
Original line number Diff line number Diff line
@@ -1436,13 +1436,11 @@ static int atl2_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	atl2_check_options(adapter);



	init_timer(&adapter->watchdog_timer);

	adapter->watchdog_timer.function = atl2_watchdog;

	adapter->watchdog_timer.data = (unsigned long) adapter;

	setup_timer(&adapter->watchdog_timer, atl2_watchdog,

		    (unsigned long)adapter);



	init_timer(&adapter->phy_config_timer);

	adapter->phy_config_timer.function = atl2_phy_config;

	adapter->phy_config_timer.data = (unsigned long) adapter;

	setup_timer(&adapter->phy_config_timer, atl2_phy_config,

		    (unsigned long)adapter);



	INIT_WORK(&adapter->reset_task, atl2_reset_task);

	INIT_WORK(&adapter->link_chg_task, atl2_link_chg_task);