summaryrefslogtreecommitdiffstats
path: root/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-10-16 16:24:46 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-10-18 15:44:39 +0200
commitd2e5af14fc8e70e76a0dfbb91d910ef74bb0eead (patch)
tree77d84f4514779c14207409f28111a486690f52d0 /drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c
parentfd5b9b83d8226a2e50ba7c01818ca4ee3dd7aa6b (diff)
downloadtalos-obmc-linux-d2e5af14fc8e70e76a0dfbb91d910ef74bb0eead.tar.gz
talos-obmc-linux-d2e5af14fc8e70e76a0dfbb91d910ef74bb0eead.zip
staging: rtl8192u: 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Derek Robson <robsonde@gmail.com> Cc: simran singhal <singhalsimran0@gmail.com> Cc: Riccardo Marotti <riccardo.marotti@gmail.com> Cc: Fabrizio Perria <fabrizio.perria@gmail.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Baoyou Xie <baoyou.xie@linaro.org> Cc: Tuomo Rinne <tuomo.rinne@gmail.com> Cc: Colin Ian King <colin.king@canonical.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/rtl8192u/ieee80211/ieee80211_crypt.c')
-rw-r--r--drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c
index 48e80be90ba5..6f457812e5a3 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c
@@ -57,9 +57,9 @@ void ieee80211_crypt_deinit_entries(struct ieee80211_device *ieee,
}
}
-void ieee80211_crypt_deinit_handler(unsigned long data)
+void ieee80211_crypt_deinit_handler(struct timer_list *t)
{
- struct ieee80211_device *ieee = (struct ieee80211_device *)data;
+ struct ieee80211_device *ieee = from_timer(ieee, t, crypt_deinit_timer);
unsigned long flags;
spin_lock_irqsave(&ieee->lock, flags);
OpenPOWER on IntegriCloud