summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAllen Pais <allen.lkml@gmail.com>2017-09-21 19:04:32 +0200
committerDavid S. Miller <davem@davemloft.net>2017-09-21 20:44:39 +0200
commit531f3ce953d4c74989eb1ece7ce37a3717532a13 (patch)
treef09f24df7873cae190911c0675a7f062010df69d /drivers
parentdrivers: net: appletalk: cops: use setup_timer() helper. (diff)
downloadlinux-531f3ce953d4c74989eb1ece7ce37a3717532a13.tar.xz
linux-531f3ce953d4c74989eb1ece7ce37a3717532a13.zip
drivers: net: rsi_91x: use setup_timer() helper.
Use setup_timer function instead of initializing timer with the function and data fields. Signed-off-by: Allen Pais <allen.lkml@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/rsi/rsi_91x_hal.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/rsi/rsi_91x_hal.c b/drivers/net/wireless/rsi/rsi_91x_hal.c
index 070dfd68bb83..7ad286d6e9a7 100644
--- a/drivers/net/wireless/rsi/rsi_91x_hal.c
+++ b/drivers/net/wireless/rsi/rsi_91x_hal.c
@@ -411,9 +411,8 @@ static void bl_cmd_timeout(unsigned long priv)
static int bl_start_cmd_timer(struct rsi_hw *adapter, u32 timeout)
{
- init_timer(&adapter->bl_cmd_timer);
- adapter->bl_cmd_timer.data = (unsigned long)adapter;
- adapter->bl_cmd_timer.function = (void *)&bl_cmd_timeout;
+ setup_timer(&adapter->bl_cmd_timer, (void *)&bl_cmd_timeout,
+ (unsigned long)adapter);
adapter->bl_cmd_timer.expires = (msecs_to_jiffies(timeout) + jiffies);
adapter->blcmd_timer_expired = false;