Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd9c504b authored by Julia Lawall's avatar Julia Lawall Committed by Emmanuel Grumbach
Browse files

iwlwifi: dvm: main: 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: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent c1dc8288

drivers/net/wireless/iwlwifi/dvm/main.c

+4 −6
Original line number Diff line number Diff line
@@ -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)