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/core.c | |
| 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/core.c')
| -rw-r--r-- | drivers/staging/rtlwifi/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/rtlwifi/core.c b/drivers/staging/rtlwifi/core.c index b55e18304a60..6306f1169581 100644 --- a/drivers/staging/rtlwifi/core.c +++ b/drivers/staging/rtlwifi/core.c @@ -116,7 +116,7 @@ static int rtl_op_start(struct ieee80211_hw *hw) mutex_lock(&rtlpriv->locks.conf_mutex); err = rtlpriv->intf_ops->adapter_start(hw); if (!err) - rtl_watch_dog_timer_callback((unsigned long)hw); + rtl_watch_dog_timer_callback(&rtlpriv->works.watchdog_timer); mutex_unlock(&rtlpriv->locks.conf_mutex); return err; } |