xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iwlwifi: mvm: remove IWL_MVM_INIT_STATUS_REG_HW_INIT_COMPLETE

Browse Source 
There's no point in this, we already do everything in a nested
fashion, and if we didn't we'd already crash in iwl_mvm_leds_exit()
etc. Just remove the bit.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
This commit is contained in:
Johannes Berg
2019-01-29 13:23:05 +01:00
committed by Luca Coelho
parent a371bb646f
commit cad7eb754d
3 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
View File

@@ -803,12 +803,9 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
ret = ieee80211_register_hw(mvm->hw); ret = ieee80211_register_hw(mvm->hw);
if (ret) { if (ret) {
iwl_mvm_leds_exit(mvm); iwl_mvm_leds_exit(mvm);
return ret;
} }
mvm->init_status |= IWL_MVM_INIT_STATUS_REG_HW_INIT_COMPLETE; return ret;
return 0;
} }
static bool iwl_mvm_defer_tx(struct iwl_mvm *mvm, static bool iwl_mvm_defer_tx(struct iwl_mvm *mvm,

1
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
View File

@@ -1221,7 +1221,6 @@ enum iwl_mvm_status {
enum iwl_mvm_init_status { enum iwl_mvm_init_status {
IWL_MVM_INIT_STATUS_THERMAL_INIT_COMPLETE = BIT(0), IWL_MVM_INIT_STATUS_THERMAL_INIT_COMPLETE = BIT(0),
IWL_MVM_INIT_STATUS_LEDS_INIT_COMPLETE = BIT(1), IWL_MVM_INIT_STATUS_LEDS_INIT_COMPLETE = BIT(1),
IWL_MVM_INIT_STATUS_REG_HW_INIT_COMPLETE = BIT(2),
}; };
static inline bool iwl_mvm_is_radio_killed(struct iwl_mvm *mvm) static inline bool iwl_mvm_is_radio_killed(struct iwl_mvm *mvm)

5
drivers/net/wireless/intel/iwlwifi/mvm/ops.c
View File

@@ -919,10 +919,7 @@ static void iwl_op_mode_mvm_stop(struct iwl_op_mode *op_mode)
iwl_mvm_thermal_exit(mvm); iwl_mvm_thermal_exit(mvm);
if (mvm->init_status & IWL_MVM_INIT_STATUS_REG_HW_INIT_COMPLETE) { ieee80211_unregister_hw(mvm->hw);
ieee80211_unregister_hw(mvm->hw);
mvm->init_status &= ~IWL_MVM_INIT_STATUS_REG_HW_INIT_COMPLETE;
}
kfree(mvm->scan_cmd); kfree(mvm->scan_cmd);
kfree(mvm->mcast_filter_cmd); kfree(mvm->mcast_filter_cmd);