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

Commit 9ad8fd0b authored by Johannes Berg's avatar Johannes Berg Committed by Luca Coelho
Browse files

iwlwifi: pcie: rename iwl_trans_check_hw_rf_kill() to pcie 



Rename this function to the more appropriate iwl_pcie_check_hw_rf_kill()
since it's only a function in the pcie code and cannot be called from
any other place.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 6667e658

drivers/net/wireless/intel/iwlwifi/pcie/drv.c

+2 −2
Original line number Diff line number Diff line
@@ -805,11 +805,11 @@ static int iwl_pci_resume(struct device *device) 
	/*

	 * Enable rfkill interrupt (in order to keep track of the rfkill

	 * status). Must be locked to avoid processing a possible rfkill

	 * interrupt while in iwl_trans_check_hw_rf_kill().

	 * interrupt while in iwl_pcie_check_hw_rf_kill().

	 */

	mutex_lock(&trans_pcie->mutex);

	iwl_enable_rfkill_int(trans);

	iwl_trans_check_hw_rf_kill(trans);

	iwl_pcie_check_hw_rf_kill(trans);

	mutex_unlock(&trans_pcie->mutex);



	return 0;

drivers/net/wireless/intel/iwlwifi/pcie/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -791,7 +791,7 @@ void iwl_pcie_enable_rx_wake(struct iwl_trans *trans, bool enable); 
void iwl_pcie_apm_config(struct iwl_trans *trans);

int iwl_pcie_prepare_card_hw(struct iwl_trans *trans);

void iwl_pcie_synchronize_irqs(struct iwl_trans *trans);

bool iwl_trans_check_hw_rf_kill(struct iwl_trans *trans);

bool iwl_pcie_check_hw_rf_kill(struct iwl_trans *trans);

void iwl_trans_pcie_handle_stop_rfkill(struct iwl_trans *trans,

				       bool was_in_rfkill);

void iwl_pcie_txq_free_tfd(struct iwl_trans *trans, struct iwl_txq *txq);

drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c

+2 −2
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ int iwl_trans_pcie_gen2_start_fw(struct iwl_trans *trans, 
	mutex_lock(&trans_pcie->mutex);



	/* If platform's RF_KILL switch is NOT set to KILL */

	hw_rfkill = iwl_trans_check_hw_rf_kill(trans);

	hw_rfkill = iwl_pcie_check_hw_rf_kill(trans);

	if (hw_rfkill && !run_in_rfkill) {

		ret = -ERFKILL;

		goto out;
@@ -340,7 +340,7 @@ int iwl_trans_pcie_gen2_start_fw(struct iwl_trans *trans, 
		goto out;



	/* re-check RF-Kill state since we may have missed the interrupt */

	hw_rfkill = iwl_trans_check_hw_rf_kill(trans);

	hw_rfkill = iwl_pcie_check_hw_rf_kill(trans);

	if (hw_rfkill && !run_in_rfkill)

		ret = -ERFKILL;

drivers/net/wireless/intel/iwlwifi/pcie/trans.c

+4 −4
Original line number Diff line number Diff line
@@ -986,7 +986,7 @@ static int iwl_pcie_load_given_ucode_8000(struct iwl_trans *trans, 
					       &first_ucode_section);

}



bool iwl_trans_check_hw_rf_kill(struct iwl_trans *trans)

bool iwl_pcie_check_hw_rf_kill(struct iwl_trans *trans)

{

	struct iwl_trans_pcie *trans_pcie =  IWL_TRANS_GET_PCIE_TRANS(trans);

	bool hw_rfkill = iwl_is_rfkill_set(trans);
@@ -1252,7 +1252,7 @@ static int iwl_trans_pcie_start_fw(struct iwl_trans *trans, 
	mutex_lock(&trans_pcie->mutex);



	/* If platform's RF_KILL switch is NOT set to KILL */

	hw_rfkill = iwl_trans_check_hw_rf_kill(trans);

	hw_rfkill = iwl_pcie_check_hw_rf_kill(trans);

	if (hw_rfkill && !run_in_rfkill) {

		ret = -ERFKILL;

		goto out;
@@ -1300,7 +1300,7 @@ static int iwl_trans_pcie_start_fw(struct iwl_trans *trans, 
		ret = iwl_pcie_load_given_ucode(trans, fw);



	/* re-check RF-Kill state since we may have missed the interrupt */

	hw_rfkill = iwl_trans_check_hw_rf_kill(trans);

	hw_rfkill = iwl_pcie_check_hw_rf_kill(trans);

	if (hw_rfkill && !run_in_rfkill)

		ret = -ERFKILL;
@@ -1663,7 +1663,7 @@ static int _iwl_trans_pcie_start_hw(struct iwl_trans *trans, bool low_power) 
	trans_pcie->is_down = false;



	/* ...rfkill can call stop_device and set it false if needed */

	iwl_trans_check_hw_rf_kill(trans);

	iwl_pcie_check_hw_rf_kill(trans);



	/* Make sure we sync here, because we'll need full access later */

	if (low_power)