From: Luca Coelho <luca@coelho.fi>
To: kvalo@codeaurora.org
Cc: linux-wireless@vger.kernel.org
Subject: [PATCH v2 02/21] iwlwifi: pcie: use the cfg we passed to iwl_trans_pcie_alloc()
Date: Thu, 5 Sep 2019 16:22:01 +0300 [thread overview]
Message-ID: <20190905132220.23970-3-luca@coelho.fi> (raw)
In-Reply-To: <20190905132220.23970-1-luca@coelho.fi>
From: Luca Coelho <luciano.coelho@intel.com>
Instead of using iwl_trans->cfg in iwl_trans_pcie_alloc(), use the
local argument that we received. This will allow us to not to set the
cfg during iwl_trans_alloc() so it can be decided later.
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
index 567f613572d8..8a95930e6c00 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
@@ -3481,7 +3481,7 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
* "dash" value). To keep hw_rev backwards compatible - we'll store it
* in the old format.
*/
- if (trans->cfg->trans.device_family >= IWL_DEVICE_FAMILY_8000) {
+ if (cfg->trans.device_family >= IWL_DEVICE_FAMILY_8000) {
unsigned long flags;
trans->hw_rev = (trans->hw_rev & 0xfff0) |
@@ -3497,7 +3497,7 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
* in-order to recognize C step driver should read chip version
* id located at the AUX bus MISC address space.
*/
- ret = iwl_finish_nic_init(trans, &trans->cfg->trans);
+ ret = iwl_finish_nic_init(trans, &cfg->trans);
if (ret)
goto out_no_pci;
@@ -3524,7 +3524,7 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
#if IS_ENABLED(CONFIG_IWLMVM)
trans->hw_rf_id = iwl_read32(trans, CSR_HW_RF_ID);
- if (trans->cfg == &iwlax210_2ax_cfg_so_hr_a0) {
+ if (cfg == &iwlax210_2ax_cfg_so_hr_a0) {
if (trans->hw_rev == CSR_HW_REV_TYPE_TY) {
trans->cfg = &iwlax210_2ax_cfg_ty_gf_a0;
} else if (CSR_HW_RF_ID_TYPE_CHIP_ID(trans->hw_rf_id) ==
@@ -3563,10 +3563,10 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
}
} else if (CSR_HW_RF_ID_TYPE_CHIP_ID(trans->hw_rf_id) ==
CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HR) &&
- ((trans->cfg != &iwl_ax200_cfg_cc &&
- trans->cfg != &killer1650x_2ax_cfg &&
- trans->cfg != &killer1650w_2ax_cfg &&
- trans->cfg != &iwl_ax201_cfg_quz_hr) ||
+ ((cfg != &iwl_ax200_cfg_cc &&
+ cfg != &killer1650x_2ax_cfg &&
+ cfg != &killer1650w_2ax_cfg &&
+ cfg != &iwl_ax201_cfg_quz_hr) ||
trans->hw_rev == CSR_HW_REV_TYPE_QNJ_B0)) {
u32 hw_status;
--
2.23.0.rc1
next prev parent reply other threads:[~2019-09-05 13:22 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-05 13:21 [PATCH v2 00/21] iwlwifi: updates intended for v5.4 2019-09-03-2 Luca Coelho
2019-09-05 13:22 ` [PATCH v2 01/21] iwlwifi: separate elements from cfg that are needed by trans_alloc Luca Coelho
2019-09-05 13:22 ` Luca Coelho [this message]
2019-09-05 13:22 ` [PATCH v2 03/21] iwlwifi: pcie: move some cfg mangling from trans_pcie_alloc to probe Luca Coelho
2019-09-05 13:22 ` [PATCH v2 04/21] iwlwifi: pcie: set iwl_trans->cfg later in the probe function Luca Coelho
2019-09-05 13:22 ` [PATCH v2 05/21] iwlwifi: pass the iwl_config_trans_params when needed Luca Coelho
2019-09-05 13:22 ` [PATCH v2 06/21] iwlwifi: add a pointer to the trans_cfg directly in trans Luca Coelho
2019-09-05 13:22 ` [PATCH v2 07/21] iwlwifi: pass the iwl_trans instead of cfg to some functions Luca Coelho
2019-09-05 13:22 ` [PATCH v2 08/21] iwlwifi: always access the trans configuration via trans Luca Coelho
2019-09-05 13:22 ` [PATCH v2 09/21] iwlwifi: fix warning iwl-trans.h is included more than once Luca Coelho
2019-09-05 13:22 ` [PATCH v2 10/21] iwlwifi: add support for suspend-resume flow for new device generation Luca Coelho
2019-09-05 13:22 ` [PATCH v2 11/21] iwlwifi: add sta_id to WOWLAN_CONFIG_CMD Luca Coelho
2019-09-05 13:22 ` [PATCH v2 12/21] iwlwifi: mvm: drop BA sessions on too many old-SN frames Luca Coelho
2019-09-05 13:22 ` [PATCH v2 13/21] iwlwifi: mvm: handle BAR_FRAME_RELEASE (0xc2) notification Luca Coelho
2019-09-05 13:22 ` [PATCH v2 14/21] iwlwifi: mvm: add support for single antenna diversity Luca Coelho
2019-09-05 13:22 ` [PATCH v2 15/21] iwlwifi: mvm: don't log un-decrypted frames Luca Coelho
2019-09-05 13:22 ` [PATCH v2 16/21] iwlwifi: add iwl_tlv_array_len() Luca Coelho
2019-09-05 13:22 ` [PATCH v2 17/21] iwlwifi: dbg_ini: remove apply point, switch to time point API Luca Coelho
2019-09-05 13:22 ` [PATCH v2 18/21] iwlwifi: fw api: add DRAM buffer allocation command Luca Coelho
2019-09-05 13:22 ` [PATCH v2 19/21] iwlwifi: dbg_ini: fix dump structs doc Luca Coelho
2019-09-05 13:22 ` [PATCH v2 20/21] iwlwifi: dbg_ini: remove periodic trigger Luca Coelho
2019-09-05 13:22 ` [PATCH v2 21/21] iwlwifi: dbg: remove iwl_fw_cancel_dumps function 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=20190905132220.23970-3-luca@coelho.fi \
--to=luca@coelho.fi \
--cc=kvalo@codeaurora.org \
--cc=linux-wireless@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.