diff options
author | Kees Cook <keescook@chromium.org> | 2017-10-24 02:29:28 -0700 |
---|---|---|
committer | Kalle Valo <kvalo@codeaurora.org> | 2017-10-27 10:48:44 +0300 |
commit | 78ce6a9083c4f5ac1a73aa0b614c852db2d4e982 (patch) | |
tree | 7beee968b5ca4cfad10b10013a7856e83433b840 /drivers/net/wireless/marvell/libertas_tf/main.c | |
parent | 08c2eb8ec800b1b5447728af0ffeebf6346bdcf2 (diff) | |
download | linux-stable-78ce6a9083c4f5ac1a73aa0b614c852db2d4e982.tar.gz linux-stable-78ce6a9083c4f5ac1a73aa0b614c852db2d4e982.tar.bz2 linux-stable-78ce6a9083c4f5ac1a73aa0b614c852db2d4e982.zip |
libertas: 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: Kalle Valo <kvalo@codeaurora.org>
Cc: Arvind Yadav <arvind.yadav.cs@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Johannes Berg <johannes.berg@intel.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Andrew Zaborowski <andrew.zaborowski@intel.com>
Cc: libertas-dev@lists.infradead.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/marvell/libertas_tf/main.c')
-rw-r--r-- | drivers/net/wireless/marvell/libertas_tf/main.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/wireless/marvell/libertas_tf/main.c b/drivers/net/wireless/marvell/libertas_tf/main.c index 81228bf73043..1d45da187b9b 100644 --- a/drivers/net/wireless/marvell/libertas_tf/main.c +++ b/drivers/net/wireless/marvell/libertas_tf/main.c @@ -165,9 +165,9 @@ done: * This function handles the timeout of command sending. * It will re-send the same command again. */ -static void command_timer_fn(unsigned long data) +static void command_timer_fn(struct timer_list *t) { - struct lbtf_private *priv = (struct lbtf_private *)data; + struct lbtf_private *priv = from_timer(priv, t, command_timer); unsigned long flags; lbtf_deb_enter(LBTF_DEB_CMD); @@ -196,8 +196,7 @@ static int lbtf_init_adapter(struct lbtf_private *priv) mutex_init(&priv->lock); priv->vif = NULL; - setup_timer(&priv->command_timer, command_timer_fn, - (unsigned long)priv); + timer_setup(&priv->command_timer, command_timer_fn, 0); INIT_LIST_HEAD(&priv->cmdfreeq); INIT_LIST_HEAD(&priv->cmdpendingq); |