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

Commit b2c1bf59 authored by Sara Sharon's avatar Sara Sharon Committed by Luca Coelho
Browse files

iwlwifi: mvm: simplify some return conditions 



Simplify some return conditions found by running a semantic patch
to detect unnecessary assignments to local variables.

Signed-off-by: default avatarSara Sharon <sara.sharon@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 7e316572

drivers/net/wireless/intel/iwlwifi/mvm/coex.c

+2 −5
Original line number Diff line number Diff line
@@ -241,7 +241,6 @@ static int iwl_mvm_bt_coex_reduced_txp(struct iwl_mvm *mvm, u8 sta_id, 
	struct iwl_bt_coex_reduced_txp_update_cmd cmd = {};

	struct iwl_mvm_sta *mvmsta;

	u32 value;

	int ret;



	mvmsta = iwl_mvm_sta_from_staid_protected(mvm, sta_id);

	if (!mvmsta)
@@ -262,10 +261,8 @@ static int iwl_mvm_bt_coex_reduced_txp(struct iwl_mvm *mvm, u8 sta_id, 
	cmd.reduced_txp = cpu_to_le32(value);

	mvmsta->bt_reduced_txpower = enable;



	ret = iwl_mvm_send_cmd_pdu(mvm, BT_COEX_UPDATE_REDUCED_TXP, CMD_ASYNC,

				   sizeof(cmd), &cmd);



	return ret;

	return iwl_mvm_send_cmd_pdu(mvm, BT_COEX_UPDATE_REDUCED_TXP,

				    CMD_ASYNC, sizeof(cmd), &cmd);

}



struct iwl_bt_iterator_data {

drivers/net/wireless/intel/iwlwifi/mvm/scan.c

+2 −3
Original line number Diff line number Diff line
@@ -1976,9 +1976,8 @@ static int iwl_mvm_scan_stop_wait(struct iwl_mvm *mvm, int type) 
		return ret;

	}



	ret = iwl_wait_notification(&mvm->notif_wait, &wait_scan_done, 1 * HZ);



	return ret;

	return iwl_wait_notification(&mvm->notif_wait, &wait_scan_done,

				     1 * HZ);

}



int iwl_mvm_scan_size(struct iwl_mvm *mvm)

drivers/net/wireless/intel/iwlwifi/mvm/sta.c

+3 −6
Original line number Diff line number Diff line
@@ -314,7 +314,6 @@ static int iwl_mvm_invalidate_sta_queue(struct iwl_mvm *mvm, int queue, 
	struct iwl_mvm_sta *mvmsta;

	u32 status;

	u8 sta_id;

	int ret;



	if (WARN_ON(iwl_mvm_has_new_tx_api(mvm)))

		return -EINVAL;
@@ -349,11 +348,9 @@ static int iwl_mvm_invalidate_sta_queue(struct iwl_mvm *mvm, int queue, 


	/* Notify FW of queue removal from the STA queues */

	status = ADD_STA_SUCCESS;

	ret = iwl_mvm_send_cmd_pdu_status(mvm, ADD_STA,

	return iwl_mvm_send_cmd_pdu_status(mvm, ADD_STA,

					   iwl_mvm_add_sta_cmd_size(mvm),

					   &cmd, &status);



	return ret;

}



static int iwl_mvm_disable_txq(struct iwl_mvm *mvm, struct ieee80211_sta *sta,