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.law...@lip6.fr
---
drivers/net/wireless/iwlwifi/dvm/main.c | 10 --
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/dvm/main.c
b/drivers/net/wireless/iwlwifi/dvm/main.c
index 0b7f46f..75ec691 100644
--- a/drivers/net/wireless/iwlwifi/dvm/main.c
+++ b/drivers/net/wireless/iwlwifi/dvm/main.c
@@ -1011,13 +1011,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)
--
To unsubscribe from this list: send the line unsubscribe linux-wireless in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
