diff options
author | Kees Cook <keescook@chromium.org> | 2017-10-24 05:29:54 -0400 |
---|---|---|
committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2017-10-27 09:54:19 -0400 |
commit | 7ac767645ab1f2f96b2c84ee8857d72d25c4eadd (patch) | |
tree | f32ddfcb2db27630a7aebcd3b4ec098e4b888ff3 /drivers/net/wireless/ath/ath6kl/wmi.c | |
parent | 698dbbf82bbf549593b78dfb6b8269522adfb62d (diff) |
ath: 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@qca.qualcomm.com>
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@qca.qualcomm.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath6kl/wmi.c')
-rw-r--r-- | drivers/net/wireless/ath/ath6kl/wmi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/wmi.c b/drivers/net/wireless/ath/ath6kl/wmi.c index bfc20b45b806..777acc564ac9 100644 --- a/drivers/net/wireless/ath/ath6kl/wmi.c +++ b/drivers/net/wireless/ath/ath6kl/wmi.c | |||
@@ -1078,9 +1078,9 @@ static int ath6kl_wmi_tkip_micerr_event_rx(struct wmi *wmi, u8 *datap, int len, | |||
1078 | return 0; | 1078 | return 0; |
1079 | } | 1079 | } |
1080 | 1080 | ||
1081 | void ath6kl_wmi_sscan_timer(unsigned long ptr) | 1081 | void ath6kl_wmi_sscan_timer(struct timer_list *t) |
1082 | { | 1082 | { |
1083 | struct ath6kl_vif *vif = (struct ath6kl_vif *) ptr; | 1083 | struct ath6kl_vif *vif = from_timer(vif, t, sched_scan_timer); |
1084 | 1084 | ||
1085 | cfg80211_sched_scan_results(vif->ar->wiphy, 0); | 1085 | cfg80211_sched_scan_results(vif->ar->wiphy, 0); |
1086 | } | 1086 | } |