summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/cw1200
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2014-12-26 15:35:37 +0100
committerKalle Valo <kvalo@codeaurora.org>2015-01-07 10:44:59 +0200
commit983988ec0a2499a5d31fdc96a1d2d7af2b3609a6 (patch)
tree5a47245b8b476053faeb155add389954fac34a5c /drivers/net/wireless/cw1200
parentb9d305cc47407f6a615145ff69e89060e7def6c7 (diff)
downloadop-kernel-dev-983988ec0a2499a5d31fdc96a1d2d7af2b3609a6.zip
op-kernel-dev-983988ec0a2499a5d31fdc96a1d2d7af2b3609a6.tar.gz
wireless: cw1200: 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/pm.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/cw1200/pm.c b/drivers/net/wireless/cw1200/pm.c
index 6907c8f..d2202ae 100644
--- a/drivers/net/wireless/cw1200/pm.c
+++ b/drivers/net/wireless/cw1200/pm.c
@@ -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;
}
OpenPOWER on IntegriCloud