summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/st/cw1200/sta.c
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-10-24 02:29:00 -0700
committerKalle Valo <kvalo@codeaurora.org>2017-10-27 10:46:24 +0300
commite3dcf8bbeb0c58df475cad58e2dc267a5c02ae20 (patch)
treef1933a53912657d24eb7ccdc846df29513676623 /drivers/net/wireless/st/cw1200/sta.c
parent3e79202b11526f6662d73501877cc18cf95b2ff8 (diff)
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: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/st/cw1200/sta.c')
-rw-r--r--drivers/net/wireless/st/cw1200/sta.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/st/cw1200/sta.c b/drivers/net/wireless/st/cw1200/sta.c
index a52224836a2b..03687a80d6e9 100644
--- a/drivers/net/wireless/st/cw1200/sta.c
+++ b/drivers/net/wireless/st/cw1200/sta.c
@@ -2112,10 +2112,9 @@ void cw1200_multicast_stop_work(struct work_struct *work)
}
}
-void cw1200_mcast_timeout(unsigned long arg)
+void cw1200_mcast_timeout(struct timer_list *t)
{
- struct cw1200_common *priv =
- (struct cw1200_common *)arg;
+ struct cw1200_common *priv = from_timer(priv, t, mcast_timeout);
wiphy_warn(priv->hw->wiphy,
"Multicast delivery timeout.\n");