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

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

iwlwifi: pcie: make iwl_pcie_apm_stop_master() return void 



Nothing ever checks the return value of iwl_pcie_apm_stop_master(),
so there's no point in it having one - make it return void.

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

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

+1 −1
Original line number Diff line number Diff line
@@ -779,7 +779,7 @@ 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);

int iwl_queue_space(const struct iwl_txq *q);

int iwl_pcie_apm_stop_master(struct iwl_trans *trans);

void iwl_pcie_apm_stop_master(struct iwl_trans *trans);

void iwl_pcie_conf_msix_hw(struct iwl_trans_pcie *trans_pcie);

int iwl_pcie_txq_init(struct iwl_trans *trans, struct iwl_txq *txq,

		      int slots_num, bool cmd_queue);

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

+2 −4
Original line number Diff line number Diff line
@@ -448,9 +448,9 @@ static void iwl_pcie_apm_lp_xtal_enable(struct iwl_trans *trans) 
				 ~SHR_APMG_XTAL_CFG_XTAL_ON_REQ);

}



int iwl_pcie_apm_stop_master(struct iwl_trans *trans)

void iwl_pcie_apm_stop_master(struct iwl_trans *trans)

{

	int ret = 0;

	int ret;



	/* stop device's busmaster DMA activity */

	iwl_set_bit(trans, CSR_RESET, CSR_RESET_REG_FLAG_STOP_MASTER);
@@ -462,8 +462,6 @@ int iwl_pcie_apm_stop_master(struct iwl_trans *trans) 
		IWL_WARN(trans, "Master Disable Timed Out, 100 usec\n");



	IWL_DEBUG_INFO(trans, "stop master\n");



	return ret;

}



static void iwl_pcie_apm_stop(struct iwl_trans *trans, bool op_mode_leave)