summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2014-12-26 15:35:49 +0100
committerKalle Valo <kvalo@codeaurora.org>2015-01-07 10:45:08 +0200
commit1a94ace406ad6befab73ac62f254c39599617c90 (patch)
treef8acf050fe6d0e7fad766c7554dc1efb1747b7c7
parentaf68b87f721166a08f3cd3282a07e0cbce15ea80 (diff)
downloadtalos-op-linux-1a94ace406ad6befab73ac62f254c39599617c90.tar.gz
talos-op-linux-1a94ace406ad6befab73ac62f254c39599617c90.zip
iwl3945: 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.data = d; -t.function = f; // </smpl> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-rw-r--r--drivers/net/wireless/iwlegacy/3945-mac.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
index dc1d20cf64ee..e5665804d986 100644
--- a/drivers/net/wireless/iwlegacy/3945-mac.c
+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
@@ -3429,9 +3429,7 @@ il3945_setup_deferred_work(struct il_priv *il)
il3945_hw_setup_deferred_work(il);
- init_timer(&il->watchdog);
- il->watchdog.data = (unsigned long)il;
- il->watchdog.function = il_bg_watchdog;
+ setup_timer(&il->watchdog, il_bg_watchdog, (unsigned long)il);
tasklet_init(&il->irq_tasklet,
(void (*)(unsigned long))il3945_irq_tasklet,
OpenPOWER on IntegriCloud