Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1fee35d0 authored by Luca Coelho's avatar Luca Coelho
Browse files

iwlwifi: don't access trans_cfg via cfg 



We copy cfg->trans to trans->trans_cfg at the very beginning, so don't
try to access it via cfg->trans anymore, because the cfg may be unset
in later cases.

Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 98d22b01

drivers/net/wireless/intel/iwlwifi/iwl-io.h

+6 −6
Original line number Diff line number Diff line
@@ -112,38 +112,38 @@ int iwl_dump_fh(struct iwl_trans *trans, char **buf); 
 */

static inline u32 iwl_umac_prph(struct iwl_trans *trans, u32 ofs)

{

	return ofs + trans->cfg->trans.umac_prph_offset;

	return ofs + trans->trans_cfg->umac_prph_offset;

}



static inline u32 iwl_read_umac_prph_no_grab(struct iwl_trans *trans, u32 ofs)

{

	return iwl_read_prph_no_grab(trans, ofs +

				     trans->cfg->trans.umac_prph_offset);

				     trans->trans_cfg->umac_prph_offset);

}



static inline u32 iwl_read_umac_prph(struct iwl_trans *trans, u32 ofs)

{

	return iwl_read_prph(trans, ofs + trans->cfg->trans.umac_prph_offset);

	return iwl_read_prph(trans, ofs + trans->trans_cfg->umac_prph_offset);

}



static inline void iwl_write_umac_prph_no_grab(struct iwl_trans *trans, u32 ofs,

					       u32 val)

{

	iwl_write_prph_no_grab(trans,  ofs + trans->cfg->trans.umac_prph_offset,

	iwl_write_prph_no_grab(trans,  ofs + trans->trans_cfg->umac_prph_offset,

			       val);

}



static inline void iwl_write_umac_prph(struct iwl_trans *trans, u32 ofs,

				       u32 val)

{

	iwl_write_prph(trans,  ofs + trans->cfg->trans.umac_prph_offset, val);

	iwl_write_prph(trans,  ofs + trans->trans_cfg->umac_prph_offset, val);

}



static inline int iwl_poll_umac_prph_bit(struct iwl_trans *trans, u32 addr,

					 u32 bits, u32 mask, int timeout)

{

	return iwl_poll_prph_bit(trans, addr +

				 trans->cfg->trans.umac_prph_offset,

				 trans->trans_cfg->umac_prph_offset,

				 bits, mask, timeout);

}