From: Luca Coelho <luca@coelho.fi>
To: kvalo@codeaurora.org
Cc: linux-wireless@vger.kernel.org,
Johannes Berg <johannes.berg@intel.com>,
Luca Coelho <luciano.coelho@intel.com>
Subject: [PATCH 15/20] iwlwifi: mvm: remove IWL_MVM_INIT_STATUS_REG_HW_INIT_COMPLETE
Date: Fri, 15 Feb 2019 13:49:19 +0200 [thread overview]
Message-ID: <20190215114924.2545-16-luca@coelho.fi> (raw)
In-Reply-To: <20190215114924.2545-1-luca@coelho.fi>
From: Johannes Berg <johannes.berg@intel.com>
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>
---
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 5 +----
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 1 -
drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 5 +----
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index a585ee509987..24556a7cd29c 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -803,12 +803,9 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
ret = ieee80211_register_hw(mvm->hw);
if (ret) {
iwl_mvm_leds_exit(mvm);
- return ret;
}
- mvm->init_status |= IWL_MVM_INIT_STATUS_REG_HW_INIT_COMPLETE;
-
- return 0;
+ return ret;
}
static bool iwl_mvm_defer_tx(struct iwl_mvm *mvm,
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index c90dd98bdd99..e03591fe4d71 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@ -1221,7 +1221,6 @@ enum iwl_mvm_status {
enum iwl_mvm_init_status {
IWL_MVM_INIT_STATUS_THERMAL_INIT_COMPLETE = BIT(0),
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)
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
index 0996c97c4b94..ba27dce4c2bb 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
@@ -919,10 +919,7 @@ static void iwl_op_mode_mvm_stop(struct iwl_op_mode *op_mode)
iwl_mvm_thermal_exit(mvm);
- if (mvm->init_status & IWL_MVM_INIT_STATUS_REG_HW_INIT_COMPLETE) {
- ieee80211_unregister_hw(mvm->hw);
- mvm->init_status &= ~IWL_MVM_INIT_STATUS_REG_HW_INIT_COMPLETE;
- }
+ ieee80211_unregister_hw(mvm->hw);
kfree(mvm->scan_cmd);
kfree(mvm->mcast_filter_cmd);
--
2.20.1
next prev parent reply other threads:[~2019-02-15 11:50 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-15 11:49 [PATCH 00/20] iwlwifi: updates intended for v5.1 2019-02-15 Luca Coelho
2019-02-15 11:49 ` [PATCH 01/20] iwlwifi: pcie: allocate rb_stts's for all queues in one place Luca Coelho
2019-02-15 11:49 ` [PATCH 02/20] iwlwifi: mvm: Don't request HW restart if already requested Luca Coelho
2019-02-15 11:49 ` [PATCH 03/20] iwlwifi: fix false-positive maybe-uninitialized warning Luca Coelho
2019-02-15 11:49 ` [PATCH 04/20] iwlwifi: eeprom-parse: use struct_size() in kzalloc() Luca Coelho
2019-02-15 11:49 ` [PATCH 05/20] iwlwifi: nvm-parse: " Luca Coelho
2019-02-15 11:49 ` [PATCH 06/20] iwlwifi: mvm: fix error path in iwl_mvm_mac_setup_register() Luca Coelho
2019-02-15 11:49 ` [PATCH 07/20] iwlwifi: nvm-parse: advertise IEEE80211_VHT_EXT_NSS_BW_CAPABLE in VHT Luca Coelho
2019-02-15 11:49 ` [PATCH 08/20] iwlwifi: dvm: no need to check return value of debugfs_create functions Luca Coelho
2019-02-15 11:49 ` [PATCH 09/20] iwlwifi: fw: " Luca Coelho
2019-02-15 11:49 ` [PATCH 10/20] iwlwifi: iwl-drv: " Luca Coelho
2019-02-15 11:49 ` [PATCH 11/20] iwlwifi: mvm: reject new beacons when in inject mode Luca Coelho
2019-02-20 8:54 ` [PATCH v2 " Luca Coelho
2019-02-15 11:49 ` [PATCH 12/20] iwlwifi: mvm: add read debugfs for he_sniffer_params Luca Coelho
2019-02-15 11:49 ` [PATCH 13/20] iwlwifi: mvm: support non-transmitting AP Luca Coelho
2019-02-15 11:49 ` [PATCH 14/20] iwlwifi: mvm: Set TX_CMD_FLG_PROT_REQUIRE correctly Luca Coelho
2019-02-15 11:49 ` Luca Coelho [this message]
2019-02-15 11:49 ` [PATCH 16/20] iwlwifi: mvm: Allow retries for probe responses Luca Coelho
2019-02-15 11:49 ` [PATCH 17/20] iwlwifi: mvm: implement VHT extended NSS support in rs.c Luca Coelho
2019-02-15 11:49 ` [PATCH 18/20] iwlwifi: remove redundant condition from prior alive dump flow Luca Coelho
2019-02-15 11:49 ` [PATCH 19/20] iwlwifi: mvm: add some debug data to TX path Luca Coelho
2019-02-15 11:49 ` [PATCH 20/20] iwlwifi: dbg_ini: fix infinite time ignore consecutive dumps Luca Coelho
2019-02-20 12:35 ` [PATCH 00/20] iwlwifi: updates intended for v5.1 2019-02-15 Kalle Valo
2019-02-20 12:43 ` Luca Coelho
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190215114924.2545-16-luca@coelho.fi \
--to=luca@coelho.fi \
--cc=johannes.berg@intel.com \
--cc=kvalo@codeaurora.org \
--cc=linux-wireless@vger.kernel.org \
--cc=luciano.coelho@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).