diff options
| author | Wei Yongjun <weiyongjun1@huawei.com> | 2016-10-18 14:38:33 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-10-25 09:59:49 +0200 |
| commit | 0371fa4f6a9efb6ebdc3529e9210218d727c3d4d (patch) | |
| tree | 41fc77ea5615ad869543d1bdcf9a14cc4ba6ef76 /drivers/staging/ks7010/ks_wlan_net.c | |
| parent | 35092b6d9b74d4ff555191f86c44a54e35708893 (diff) | |
staging: ks7010: ks_wlan_net: Use setup_timer instead of init_timer and data fields
Use setup_timer function instead of initializing timer with the function
and data fields
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/ks7010/ks_wlan_net.c')
| -rw-r--r-- | drivers/staging/ks7010/ks_wlan_net.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/ks7010/ks_wlan_net.c b/drivers/staging/ks7010/ks_wlan_net.c index 7b864c02348b..3c58f8427e03 100644 --- a/drivers/staging/ks7010/ks_wlan_net.c +++ b/drivers/staging/ks7010/ks_wlan_net.c @@ -3460,9 +3460,8 @@ int ks_wlan_net_start(struct net_device *dev) /* phy information update timer */ atomic_set(&update_phyinfo, 0); - init_timer(&update_phyinfo_timer); - update_phyinfo_timer.function = ks_wlan_update_phyinfo_timeout; - update_phyinfo_timer.data = (unsigned long)priv; + setup_timer(&update_phyinfo_timer, ks_wlan_update_phyinfo_timeout, + (unsigned long)priv); /* dummy address set */ memcpy(priv->eth_addr, dummy_addr, ETH_ALEN); |