wireless: cw1200: Use setup_timer
authorJulia Lawall <Julia.Lawall@lip6.fr>
Fri, 26 Dec 2014 14:35:37 +0000 (15:35 +0100)
committerKalle Valo <kvalo@codeaurora.org>
Wed, 7 Jan 2015 08:44:59 +0000 (10:44 +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: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/cw1200/pm.c

index 6907c8fd4578d001293eaf77d4c1dbad6b96177f..d2202ae92bdd85fd79dea753c270999a2e9073f6 100644 (file)
@@ -101,9 +101,8 @@ int cw1200_pm_init(struct cw1200_pm_state *pm,
 {
        spin_lock_init(&pm->lock);
 
-       init_timer(&pm->stay_awake);
-       pm->stay_awake.data = (unsigned long)pm;
-       pm->stay_awake.function = cw1200_pm_stay_awake_tmo;
+       setup_timer(&pm->stay_awake, cw1200_pm_stay_awake_tmo,
+                   (unsigned long)pm);
 
        return 0;
 }