summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-10-17 03:29:01 +0300
committerDavid S. Miller <davem@davemloft.net>2017-10-18 14:39:38 +0300
commitd3e99b2d19b06030593761c658b648fd6427eaa1 (patch)
tree24cba9c9fe1071ae1a83dcce80dae40e8f4f5a2b /drivers/net
parentabec4be3ee68c8572adb39da68fbfd86e63daa84 (diff)
downloadlinux-d3e99b2d19b06030593761c658b648fd6427eaa1.tar.xz
net/cw1200: Convert timers to use timer_setup()
In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly. Cc: Solomon Peachy <pizza@shaftnet.org> Cc: Kalle Valo <kvalo@codeaurora.org> Cc: linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/st/cw1200/pm.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/st/cw1200/pm.c b/drivers/net/wireless/st/cw1200/pm.c
index d2202ae92bdd..ded23df1ac1d 100644
--- a/drivers/net/wireless/st/cw1200/pm.c
+++ b/drivers/net/wireless/st/cw1200/pm.c
@@ -91,7 +91,7 @@ struct cw1200_suspend_state {
u8 prev_ps_mode;
};
-static void cw1200_pm_stay_awake_tmo(unsigned long arg)
+static void cw1200_pm_stay_awake_tmo(struct timer_list *unused)
{
/* XXX what's the point of this ? */
}
@@ -101,8 +101,7 @@ int cw1200_pm_init(struct cw1200_pm_state *pm,
{
spin_lock_init(&pm->lock);
- setup_timer(&pm->stay_awake, cw1200_pm_stay_awake_tmo,
- (unsigned long)pm);
+ timer_setup(&pm->stay_awake, cw1200_pm_stay_awake_tmo, 0);
return 0;
}