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

Commit 4ed735e7 authored by Johannes Berg's avatar Johannes Berg Committed by Emmanuel Grumbach
Browse files

iwlwifi: remove iwl_fw_valid_(tx|rx)_ant inlines 



These inlines are pretty pointless now as they just return a
fixed struct value, remove them - the code even gets shorter.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Reviewed-by: default avatarEran Harary <eran.harary@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 77db0a3c

drivers/net/wireless/iwlwifi/iwl-fw.h

+0 −10
Original line number Diff line number Diff line
@@ -296,14 +296,4 @@ struct iwl_fw { 
	struct ieee80211_cipher_scheme cs[IWL_UCODE_MAX_CS];

};



static inline u8 iwl_fw_valid_tx_ant(const struct iwl_fw *fw)

{

	return fw->valid_tx_ant;

}



static inline u8 iwl_fw_valid_rx_ant(const struct iwl_fw *fw)

{

	return fw->valid_rx_ant;

}



#endif  /* __iwl_fw_h__ */

drivers/net/wireless/iwlwifi/mvm/debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -591,7 +591,7 @@ iwl_dbgfs_scan_ant_rxchain_write(struct iwl_mvm *mvm, char *buf, 
		return -EINVAL;

	if (scan_rx_ant > ANT_ABC)

		return -EINVAL;

	if (scan_rx_ant & ~iwl_fw_valid_rx_ant(mvm->fw))

	if (scan_rx_ant & ~mvm->fw->valid_rx_ant)

		return -EINVAL;



	mvm->scan_rx_ant = scan_rx_ant;

drivers/net/wireless/iwlwifi/mvm/fw.c

+3 −3
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ int iwl_run_init_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm) 
	}



	/* Send TX valid antennas before triggering calibrations */

	ret = iwl_send_tx_ant_cfg(mvm, iwl_fw_valid_tx_ant(mvm->fw));

	ret = iwl_send_tx_ant_cfg(mvm, mvm->fw->valid_tx_ant);

	if (ret)

		goto error;
@@ -422,7 +422,7 @@ int iwl_mvm_up(struct iwl_mvm *mvm) 
	if (ret)

		IWL_ERR(mvm, "Failed to initialize Smart Fifo\n");



	ret = iwl_send_tx_ant_cfg(mvm, iwl_fw_valid_tx_ant(mvm->fw));

	ret = iwl_send_tx_ant_cfg(mvm, mvm->fw->valid_tx_ant);

	if (ret)

		goto error;
@@ -507,7 +507,7 @@ int iwl_mvm_load_d3_fw(struct iwl_mvm *mvm) 
		goto error;

	}



	ret = iwl_send_tx_ant_cfg(mvm, iwl_fw_valid_tx_ant(mvm->fw));

	ret = iwl_send_tx_ant_cfg(mvm, mvm->fw->valid_tx_ant);

	if (ret)

		goto error;

drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c

+1 −1
Original line number Diff line number Diff line
@@ -952,7 +952,7 @@ static int iwl_mvm_mac_ctxt_send_beacon(struct iwl_mvm *mvm, 
					     TX_CMD_FLG_TSF);



	mvm->mgmt_last_antenna_idx =

		iwl_mvm_next_antenna(mvm, iwl_fw_valid_tx_ant(mvm->fw),

		iwl_mvm_next_antenna(mvm, mvm->fw->valid_tx_ant,

				     mvm->mgmt_last_antenna_idx);



	beacon_cmd.tx.rate_n_flags =

drivers/net/wireless/iwlwifi/mvm/nvm.c

+2 −2
Original line number Diff line number Diff line
@@ -259,8 +259,8 @@ iwl_parse_nvm_sections(struct iwl_mvm *mvm) 


	return iwl_parse_nvm_data(mvm->trans->dev, mvm->cfg, hw, sw, calib,

				  regulatory, mac_override,

				  iwl_fw_valid_tx_ant(mvm->fw),

				  iwl_fw_valid_rx_ant(mvm->fw));

				  mvm->fw->valid_tx_ant,

				  mvm->fw->valid_rx_ant);

}



#define MAX_NVM_FILE_LEN	16384