Browse Source

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>
Julia Lawall 10 years ago
parent
commit
1a94ace406
1 changed files with 1 additions and 3 deletions
  1. 1 3
      drivers/net/wireless/iwlegacy/3945-mac.c

+ 1 - 3
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);
 	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,
 	tasklet_init(&il->irq_tasklet,
 		     (void (*)(unsigned long))il3945_irq_tasklet,
 		     (void (*)(unsigned long))il3945_irq_tasklet,