iwl4965: 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>

diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c
index 2748fde4b90c0fa5113240765b06aaceeeeeb331..976f65fe9c383f8ecd9653dfa0b7c091dbc4f79d 100644 (file)
--- a/drivers/net/wireless/iwlegacy/4965-mac.c
+++ b/drivers/net/wireless/iwlegacy/4965-mac.c
@@ -6247,13 +6247,10 @@ il4965_setup_deferred_work(struct il_priv *il)
 
        INIT_WORK(&il->txpower_work, il4965_bg_txpower_work);
 
-       init_timer(&il->stats_periodic);
-       il->stats_periodic.data = (unsigned long)il;
-       il->stats_periodic.function = il4965_bg_stats_periodic;
+       setup_timer(&il->stats_periodic, il4965_bg_stats_periodic,
+                   (unsigned long)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))il4965_irq_tasklet,