diff options
| author | Kees Cook | 2017-10-17 01:25:12 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2017-10-18 15:52:39 +0200 |
| commit | f8af6a323368dd28fcea9742d582593c9adb2261 (patch) | |
| tree | 9dc5a708a3fbda8ffb58c37e45a537269bc5e789 /drivers/staging/rtlwifi/base.h | |
| parent | staging: comedi: adv_pci_dio: update for PCI-1761 (diff) | |
| download | kernel-qcow2-linux-f8af6a323368dd28fcea9742d582593c9adb2261.tar.gz kernel-qcow2-linux-f8af6a323368dd28fcea9742d582593c9adb2261.tar.xz kernel-qcow2-linux-f8af6a323368dd28fcea9742d582593c9adb2261.zip | |
staging: rtlwifi: 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. Also drops unused odm timer code.
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Kalle Valo <kvalo@codeaurora.org>
Cc: Ping-Ke Shih <pkshih@realtek.com>
Cc: shaofu <shaofu@realtek.com>
Cc: devel@driverdev.osuosl.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtlwifi/base.h')
| -rw-r--r-- | drivers/staging/rtlwifi/base.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/rtlwifi/base.h b/drivers/staging/rtlwifi/base.h index 1829712dc4e2..b7f92b32978e 100644 --- a/drivers/staging/rtlwifi/base.h +++ b/drivers/staging/rtlwifi/base.h @@ -120,7 +120,7 @@ void rtl_init_rx_config(struct ieee80211_hw *hw); void rtl_init_rfkill(struct ieee80211_hw *hw); void rtl_deinit_rfkill(struct ieee80211_hw *hw); -void rtl_watch_dog_timer_callback(unsigned long data); +void rtl_watch_dog_timer_callback(struct timer_list *t); void rtl_deinit_deferred_work(struct ieee80211_hw *hw); bool rtl_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx); @@ -176,7 +176,7 @@ int rtl_send_smps_action(struct ieee80211_hw *hw, u8 *rtl_find_ie(u8 *data, unsigned int len, u8 ie); void rtl_recognize_peer(struct ieee80211_hw *hw, u8 *data, unsigned int len); u8 rtl_tid_to_ac(u8 tid); -void rtl_easy_concurrent_retrytimer_callback(unsigned long data); +void rtl_easy_concurrent_retrytimer_callback(struct timer_list *t); extern struct rtl_global_var rtl_global_var; void rtl_phy_scan_operation_backup(struct ieee80211_hw *hw, u8 operation); bool rtl_check_beacon_key(struct ieee80211_hw *hw, void *data, |