Browse Source

mwifiex: tdls: 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.function = f;
-t.data = d;
// </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
6383539b97
1 changed files with 2 additions and 3 deletions
  1. 2 3
      drivers/net/wireless/mwifiex/tdls.c

+ 2 - 3
drivers/net/wireless/mwifiex/tdls.c

@@ -1397,9 +1397,8 @@ void mwifiex_check_auto_tdls(unsigned long context)
 
 
 void mwifiex_setup_auto_tdls_timer(struct mwifiex_private *priv)
 void mwifiex_setup_auto_tdls_timer(struct mwifiex_private *priv)
 {
 {
-	init_timer(&priv->auto_tdls_timer);
-	priv->auto_tdls_timer.function = mwifiex_check_auto_tdls;
-	priv->auto_tdls_timer.data = (unsigned long)priv;
+	setup_timer(&priv->auto_tdls_timer, mwifiex_check_auto_tdls,
+		    (unsigned long)priv);
 	priv->auto_tdls_timer_active = true;
 	priv->auto_tdls_timer_active = true;
 	mod_timer(&priv->auto_tdls_timer,
 	mod_timer(&priv->auto_tdls_timer,
 		  jiffies + msecs_to_jiffies(MWIFIEX_TIMER_10S));
 		  jiffies + msecs_to_jiffies(MWIFIEX_TIMER_10S));