aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
diff options
context:
space:
mode:
authorGolan Ben Ami <golan.ben.ami@intel.com>2017-10-25 10:02:59 -0400
committerLuca Coelho <luciano.coelho@intel.com>2017-12-20 11:28:24 -0500
commit870c2a1123b8b63be54f4c512e5d12dabec66b95 (patch)
tree378bdc59f957dfeaac4ab419dbc7ea24be594efd /drivers/net/wireless/intel/iwlwifi/mvm/utils.c
parentfd527eb5d2293667bfe9d9bae8eecb2967ce32f8 (diff)
iwlwifi: avoid duplicate sw reset executions in the code
Most of the sw resets in the code are done by one function, which writes to the relevant CSR. Use the common function to perform the only reset which was done separately, redundant to the common code. Signed-off-by: Golan Ben Ami <golan.ben.ami@intel.com> Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/utils.c')
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/utils.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/utils.c b/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
index 0b7e29be8e50..b2e9a79d4186 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
@@ -516,8 +516,7 @@ static void iwl_mvm_dump_lmac_error_log(struct iwl_mvm *mvm, u32 base)
516 IWL_ERR(trans, "HW error, resetting before reading\n"); 516 IWL_ERR(trans, "HW error, resetting before reading\n");
517 517
518 /* reset the device */ 518 /* reset the device */
519 iwl_set_bit(trans, CSR_RESET, CSR_RESET_REG_FLAG_SW_RESET); 519 iwl_trans_sw_reset(trans);
520 usleep_range(5000, 6000);
521 520
522 /* set INIT_DONE flag */ 521 /* set INIT_DONE flag */
523 iwl_set_bit(trans, CSR_GP_CNTRL, 522 iwl_set_bit(trans, CSR_GP_CNTRL,