Messages in this thread Patch in this message | | | Date | Tue, 24 Oct 2017 01:26:09 -0700 | From | Kees Cook <> | Subject | [PATCH] staging: ks7010: 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: "Tobin C. Harding" <me@tobin.cc> Cc: devel@driverdev.osuosl.org Signed-off-by: Kees Cook <keescook@chromium.org> --- drivers/staging/ks7010/ks_wlan_net.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/ks7010/ks_wlan_net.c b/drivers/staging/ks7010/ks_wlan_net.c index b82b515a514f..880085e2f24a 100644 --- a/drivers/staging/ks7010/ks_wlan_net.c +++ b/drivers/staging/ks7010/ks_wlan_net.c @@ -114,7 +114,7 @@ int ks_wlan_update_phy_information(struct ks_wlan_private *priv) } static -void ks_wlan_update_phyinfo_timeout(unsigned long ptr) +void ks_wlan_update_phyinfo_timeout(struct timer_list *unused) { DPRINTK(4, "in_interrupt = %ld\n", in_interrupt()); atomic_set(&update_phyinfo, 0); @@ -2951,8 +2951,7 @@ int ks_wlan_net_start(struct net_device *dev) /* phy information update timer */ atomic_set(&update_phyinfo, 0); - setup_timer(&update_phyinfo_timer, ks_wlan_update_phyinfo_timeout, - (unsigned long)priv); + timer_setup(&update_phyinfo_timer, ks_wlan_update_phyinfo_timeout, 0); /* dummy address set */ memcpy(priv->eth_addr, dummy_addr, ETH_ALEN); -- 2.7.4
-- Kees Cook Pixel Security
| |