mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
iwlwifi: unify iwl_get_ucode_image() implementations
Avoid multiple implementations. Signed-off-by: Sharon Dvir <sharon.dvir@intel.com> Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
This commit is contained in:
parent
9fb064df6d
commit
612da1efc0
3 changed files with 12 additions and 21 deletions
|
@ -46,15 +46,6 @@
|
|||
*
|
||||
******************************************************************************/
|
||||
|
||||
static inline const struct fw_img *
|
||||
iwl_get_ucode_image(struct iwl_priv *priv, enum iwl_ucode_type ucode_type)
|
||||
{
|
||||
if (ucode_type >= IWL_UCODE_TYPE_MAX)
|
||||
return NULL;
|
||||
|
||||
return &priv->fw->img[ucode_type];
|
||||
}
|
||||
|
||||
/*
|
||||
* Calibration
|
||||
*/
|
||||
|
@ -330,7 +321,7 @@ int iwl_load_ucode_wait_alive(struct iwl_priv *priv,
|
|||
enum iwl_ucode_type old_type;
|
||||
static const u16 alive_cmd[] = { REPLY_ALIVE };
|
||||
|
||||
fw = iwl_get_ucode_image(priv, ucode_type);
|
||||
fw = iwl_get_ucode_image(priv->fw, ucode_type);
|
||||
if (WARN_ON(!fw))
|
||||
return -EINVAL;
|
||||
|
||||
|
|
|
@ -329,4 +329,13 @@ iwl_fw_dbg_conf_usniffer(const struct iwl_fw *fw, u8 id)
|
|||
return conf_tlv->usniffer;
|
||||
}
|
||||
|
||||
static inline const struct fw_img *
|
||||
iwl_get_ucode_image(const struct iwl_fw *fw, enum iwl_ucode_type ucode_type)
|
||||
{
|
||||
if (ucode_type >= IWL_UCODE_TYPE_MAX)
|
||||
return NULL;
|
||||
|
||||
return &fw->img[ucode_type];
|
||||
}
|
||||
|
||||
#endif /* __iwl_fw_h__ */
|
||||
|
|
|
@ -90,15 +90,6 @@ struct iwl_mvm_alive_data {
|
|||
u32 scd_base_addr;
|
||||
};
|
||||
|
||||
static inline const struct fw_img *
|
||||
iwl_get_ucode_image(struct iwl_mvm *mvm, enum iwl_ucode_type ucode_type)
|
||||
{
|
||||
if (ucode_type >= IWL_UCODE_TYPE_MAX)
|
||||
return NULL;
|
||||
|
||||
return &mvm->fw->img[ucode_type];
|
||||
}
|
||||
|
||||
static int iwl_send_tx_ant_cfg(struct iwl_mvm *mvm, u8 valid_tx_ant)
|
||||
{
|
||||
struct iwl_tx_ant_cfg_cmd tx_ant_cmd = {
|
||||
|
@ -592,9 +583,9 @@ static int iwl_mvm_load_ucode_wait_alive(struct iwl_mvm *mvm,
|
|||
iwl_fw_dbg_conf_usniffer(mvm->fw, FW_DBG_START_FROM_ALIVE) &&
|
||||
!(fw_has_capa(&mvm->fw->ucode_capa,
|
||||
IWL_UCODE_TLV_CAPA_USNIFFER_UNIFIED)))
|
||||
fw = iwl_get_ucode_image(mvm, IWL_UCODE_REGULAR_USNIFFER);
|
||||
fw = iwl_get_ucode_image(mvm->fw, IWL_UCODE_REGULAR_USNIFFER);
|
||||
else
|
||||
fw = iwl_get_ucode_image(mvm, ucode_type);
|
||||
fw = iwl_get_ucode_image(mvm->fw, ucode_type);
|
||||
if (WARN_ON(!fw))
|
||||
return -EINVAL;
|
||||
mvm->cur_ucode = ucode_type;
|
||||
|
|
Loading…
Reference in a new issue