[PATCH 18/25] iwlwifi: mvm: use setup_timer instead of init_timer and data fields

[Luca Coelho]

From: Wei Yongjun <yongjun_...@trendmicro.com.cn>

Use setup_timer function instead of initializing timer with the function
and data fields

Signed-off-by: Wei Yongjun <yongjun_...@trendmicro.com.cn>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumb...@intel.com>
Signed-off-by: Luca Coelho <luciano.coe...@intel.com>
---
 drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c 
b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
index 11c7e15..216aa54 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
@@ -2050,11 +2050,9 @@ int iwl_mvm_sta_rx_agg(struct iwl_mvm *mvm, struct 
ieee80211_sta *sta,
                baid_data->baid = baid;
                baid_data->timeout = timeout;
                baid_data->last_rx = jiffies;
-               init_timer(&baid_data->session_timer);
-               baid_data->session_timer.function =
-                       iwl_mvm_rx_agg_session_expired;
-               baid_data->session_timer.data =
-                       (unsigned long)&mvm->baid_map[baid];
+               setup_timer(&baid_data->session_timer,
+                           iwl_mvm_rx_agg_session_expired,
+                           (unsigned long)&mvm->baid_map[baid]);
                baid_data->mvm = mvm;
                baid_data->tid = tid;
                baid_data->sta_id = mvm_sta->sta_id;
-- 
2.9.3