Commit 8a81f749 authored by Kees Cook's avatar Kees Cook Committed by Greg Kroah-Hartman

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: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 313144c1
...@@ -114,7 +114,7 @@ int ks_wlan_update_phy_information(struct ks_wlan_private *priv) ...@@ -114,7 +114,7 @@ int ks_wlan_update_phy_information(struct ks_wlan_private *priv)
} }
static 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()); DPRINTK(4, "in_interrupt = %ld\n", in_interrupt());
atomic_set(&update_phyinfo, 0); atomic_set(&update_phyinfo, 0);
...@@ -2951,8 +2951,7 @@ int ks_wlan_net_start(struct net_device *dev) ...@@ -2951,8 +2951,7 @@ int ks_wlan_net_start(struct net_device *dev)
/* phy information update timer */ /* phy information update timer */
atomic_set(&update_phyinfo, 0); atomic_set(&update_phyinfo, 0);
setup_timer(&update_phyinfo_timer, ks_wlan_update_phyinfo_timeout, timer_setup(&update_phyinfo_timer, ks_wlan_update_phyinfo_timeout, 0);
(unsigned long)priv);
/* dummy address set */ /* dummy address set */
memcpy(priv->eth_addr, dummy_addr, ETH_ALEN); memcpy(priv->eth_addr, dummy_addr, ETH_ALEN);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment