[PATCH 11/64] drivers: net: rsi_91x: use setup_timer() helper.
From: Allen Pais <hidden>
Date: 2017-09-21 17:06:57
Also in:
lkml, netdev
Subsystem:
redpine wireless driver, the rest · Maintainer:
Linus Torvalds
Use setup_timer function instead of initializing timer with the
function and data fields.
Signed-off-by: Allen Pais <redacted>
---
drivers/net/wireless/rsi/rsi_91x_hal.c | 5 ++---
1 file 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 070dfd6..7ad286d 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;
--
2.7.4