diff options
author | Julia Lawall <Julia.Lawall@lip6.fr> | 2014-12-26 09:35:38 -0500 |
---|---|---|
committer | Kalle Valo <kvalo@codeaurora.org> | 2015-01-07 03:45:02 -0500 |
commit | dabefea6937dc0015624a43ec1b8764f5b3dcb68 (patch) | |
tree | 357b384e73b843f92cb19da75bc28fdf3c1ed782 /drivers/net/wireless/cw1200 | |
parent | 983988ec0a2499a5d31fdc96a1d2d7af2b3609a6 (diff) |
cw1200: 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: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/cw1200')
-rw-r--r-- | drivers/net/wireless/cw1200/main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/cw1200/main.c b/drivers/net/wireless/cw1200/main.c index 3e78cc3ccb78..fa965ee9f56b 100644 --- a/drivers/net/wireless/cw1200/main.c +++ b/drivers/net/wireless/cw1200/main.c | |||
@@ -374,9 +374,8 @@ static struct ieee80211_hw *cw1200_init_common(const u8 *macaddr, | |||
374 | INIT_WORK(&priv->update_filtering_work, cw1200_update_filtering_work); | 374 | INIT_WORK(&priv->update_filtering_work, cw1200_update_filtering_work); |
375 | INIT_WORK(&priv->set_beacon_wakeup_period_work, | 375 | INIT_WORK(&priv->set_beacon_wakeup_period_work, |
376 | cw1200_set_beacon_wakeup_period_work); | 376 | cw1200_set_beacon_wakeup_period_work); |
377 | init_timer(&priv->mcast_timeout); | 377 | setup_timer(&priv->mcast_timeout, cw1200_mcast_timeout, |
378 | priv->mcast_timeout.data = (unsigned long)priv; | 378 | (unsigned long)priv); |
379 | priv->mcast_timeout.function = cw1200_mcast_timeout; | ||
380 | 379 | ||
381 | if (cw1200_queue_stats_init(&priv->tx_queue_stats, | 380 | if (cw1200_queue_stats_init(&priv->tx_queue_stats, |
382 | CW1200_LINK_ID_MAX, | 381 | CW1200_LINK_ID_MAX, |