cw1200: main: Use setup_timer
authorJulia Lawall <Julia.Lawall@lip6.fr>
Fri, 26 Dec 2014 14:35:38 +0000 (15:35 +0100)
committerKalle Valo <kvalo@codeaurora.org>
Wed, 7 Jan 2015 08:45:02 +0000 (10:45 +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/main.c

index 3e78cc3ccb78390593fc4365661ddd31e10ba166..fa965ee9f56bdf2145f59f53c427df03b1de999c 100644 (file)
@@ -374,9 +374,8 @@ static struct ieee80211_hw *cw1200_init_common(const u8 *macaddr,
        INIT_WORK(&priv->update_filtering_work, cw1200_update_filtering_work);
        INIT_WORK(&priv->set_beacon_wakeup_period_work,
                  cw1200_set_beacon_wakeup_period_work);
-       init_timer(&priv->mcast_timeout);
-       priv->mcast_timeout.data = (unsigned long)priv;
-       priv->mcast_timeout.function = cw1200_mcast_timeout;
+       setup_timer(&priv->mcast_timeout, cw1200_mcast_timeout,
+                   (unsigned long)priv);
 
        if (cw1200_queue_stats_init(&priv->tx_queue_stats,
                                    CW1200_LINK_ID_MAX,