iwlwifi: dvm: main: Use setup_timer
authorJulia Lawall <Julia.Lawall@lip6.fr>
Fri, 26 Dec 2014 14:35:44 +0000 (15:35 +0100)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Sun, 28 Dec 2014 18:00:22 +0000 (20:00 +0200)
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: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
drivers/net/wireless/iwlwifi/dvm/main.c

index fcdc128298ea22d2715db6b1f2119b149ba99b79..de43dd7e170aca6a4831be3993a0295f10afffbb 100644 (file)
@@ -997,13 +997,11 @@ static void iwl_setup_deferred_work(struct iwl_priv *priv)
        if (priv->lib->bt_params)
                iwlagn_bt_setup_deferred_work(priv);
 
-       init_timer(&priv->statistics_periodic);
-       priv->statistics_periodic.data = (unsigned long)priv;
-       priv->statistics_periodic.function = iwl_bg_statistics_periodic;
+       setup_timer(&priv->statistics_periodic, iwl_bg_statistics_periodic,
+                   (unsigned long)priv);
 
-       init_timer(&priv->ucode_trace);
-       priv->ucode_trace.data = (unsigned long)priv;
-       priv->ucode_trace.function = iwl_bg_ucode_trace;
+       setup_timer(&priv->ucode_trace, iwl_bg_ucode_trace,
+                   (unsigned long)priv);
 }
 
 void iwl_cancel_deferred_work(struct iwl_priv *priv)