diff options
| author | Kees Cook <keescook@chromium.org> | 2017-10-24 12:29:19 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2017-10-27 10:47:57 +0300 |
| commit | 08c2eb8ec800b1b5447728af0ffeebf6346bdcf2 (patch) | |
| tree | 8bfd3fea91cadaa4d9c8d299a3a45af4266fc601 /drivers/net/wireless/marvell/mwifiex/init.c | |
| parent | dfefb9f8d082b609197f7ea852333e7a5ecc9563 (diff) | |
| download | linux-08c2eb8ec800b1b5447728af0ffeebf6346bdcf2.tar.xz | |
mwifiex: 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: Amitkumar Karwar <amitkarwar@gmail.com>
Cc: Nishant Sarmukadam <nishants@marvell.com>
Cc: Ganapathi Bhat <gbhat@marvell.com>
Cc: Xinming Hu <huxm@marvell.com>
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/mwifiex/init.c')
| -rw-r--r-- | drivers/net/wireless/marvell/mwifiex/init.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/wireless/marvell/mwifiex/init.c b/drivers/net/wireless/marvell/mwifiex/init.c index 1176706ab094..e1aa86042469 100644 --- a/drivers/net/wireless/marvell/mwifiex/init.c +++ b/drivers/net/wireless/marvell/mwifiex/init.c @@ -52,9 +52,9 @@ static int mwifiex_add_bss_prio_tbl(struct mwifiex_private *priv) return 0; } -static void wakeup_timer_fn(unsigned long data) +static void wakeup_timer_fn(struct timer_list *t) { - struct mwifiex_adapter *adapter = (struct mwifiex_adapter *)data; + struct mwifiex_adapter *adapter = from_timer(adapter, t, wakeup_timer); mwifiex_dbg(adapter, ERROR, "Firmware wakeup failed\n"); adapter->hw_status = MWIFIEX_HW_STATUS_RESET; @@ -313,8 +313,7 @@ static void mwifiex_init_adapter(struct mwifiex_adapter *adapter) adapter->iface_limit.uap_intf = MWIFIEX_MAX_UAP_NUM; adapter->iface_limit.p2p_intf = MWIFIEX_MAX_P2P_NUM; adapter->active_scan_triggered = false; - setup_timer(&adapter->wakeup_timer, wakeup_timer_fn, - (unsigned long)adapter); + timer_setup(&adapter->wakeup_timer, wakeup_timer_fn, 0); } /* |