diff options
| author |   Kees Cook <keescook@chromium.org> | 2017-10-18 13:23:31 -0700 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-20 14:42:50 +0200 |
| commit | 5eb54a9997596ce1192e3416ccacc9acd17c34ef (patch) | |
| tree | 524288aff361803925d3f3c0a139cdb8712c7b38 /drivers/staging/wlan-ng/prism2sta.c | |
| parent | staging/irda/bfin_sir: Convert timers to use timer_setup() (diff) | |
| download | linux-dev-5eb54a9997596ce1192e3416ccacc9acd17c34ef.tar.xz linux-dev-5eb54a9997596ce1192e3416ccacc9acd17c34ef.zip | |
staging: wlan-ng: 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: Sergio Paracuellos <sergio.paracuellos@gmail.com>
Cc: Adrien Descamps <adrien.descamps@gmail.com>
Cc: Thibaut SAUTEREAU <thibaut.sautereau@telecom-sudparis.eu>
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/wlan-ng/prism2sta.c')
| -rw-r--r-- | drivers/staging/wlan-ng/prism2sta.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/wlan-ng/prism2sta.c b/drivers/staging/wlan-ng/prism2sta.c index 070a237004cb..99316b9a4e49 100644 --- a/drivers/staging/wlan-ng/prism2sta.c +++ b/drivers/staging/wlan-ng/prism2sta.c @@ -2004,9 +2004,9 @@ void prism2sta_commsqual_defer(struct work_struct *data) mod_timer(&hw->commsqual_timer, jiffies + HZ); } -void prism2sta_commsqual_timer(unsigned long data) +void prism2sta_commsqual_timer(struct timer_list *t) { - struct hfa384x *hw = (struct hfa384x *)data; + struct hfa384x *hw = from_timer(hw, t, commsqual_timer); schedule_work(&hw->commsqual_bh); } |