Commit 6d7cb4a6 authored by Jakob Koschel's avatar Jakob Koschel Committed by Gregory Greenman
Browse files

wifi: iwlwifi: mvm: replace usage of found with dedicated list iterator variable 

To move the list iterator variable into the list_for_each_entry_*()
macro in the future it should be avoided to use the list iterator
variable after the loop body.

To *never* use the list iterator variable after the loop it was
concluded to use a separate iterator variable instead of a
found boolean [1].

This removes the need to use a found variable and simply checking if
the variable was set, can determine if the break/goto was hit.

While at it, stop using the unnecessary _safe() variant.

[1] https://lore.kernel.org/all/CAHk-=wgRr_D8CB-D9Kg-c=EHreAsk5SqXPwr9Y7k9sA6cWXJ6w@mail.gmail.com/



Signed-off-by: default avatarJakob Koschel <jakobkoschel@gmail.com>
[change to not use _safe variant]
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20221205102808.e4882dc35543.I32b2b945ba234de72ee119fc20f5b8be02b6a3f2@changeid
parent 838a0c7d

drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c

+5 −7
Original line number Diff line number Diff line
@@ -1010,11 +1010,10 @@ static int iwl_mvm_ftm_range_resp_valid(struct iwl_mvm *mvm, u8 request_id, 
static void iwl_mvm_ftm_rtt_smoothing(struct iwl_mvm *mvm,

				      struct cfg80211_pmsr_result *res)

{

	struct iwl_mvm_smooth_entry *resp;

	struct iwl_mvm_smooth_entry *resp = NULL, *iter;

	s64 rtt_avg, rtt = res->ftm.rtt_avg;

	u32 undershoot, overshoot;

	u8 alpha;

	bool found;



	if (!IWL_MVM_FTM_INITIATOR_ENABLE_SMOOTH)

		return;
@@ -1028,15 +1027,14 @@ static void iwl_mvm_ftm_rtt_smoothing(struct iwl_mvm *mvm, 
		return;

	}



	found = false;

	list_for_each_entry(resp, &mvm->ftm_initiator.smooth.resp, list) {

		if (!memcmp(res->addr, resp->addr, ETH_ALEN)) {

			found = true;

	list_for_each_entry(iter, &mvm->ftm_initiator.smooth.resp, list) {

		if (!memcmp(res->addr, iter->addr, ETH_ALEN)) {

			resp = iter;

			break;

		}

	}



	if (!found) {

	if (!resp) {

		resp = kzalloc(sizeof(*resp), GFP_KERNEL);

		if (!resp)

			return;

drivers/net/wireless/intel/iwlwifi/mvm/time-event.c

+3 −4
Original line number Diff line number Diff line
@@ -376,12 +376,11 @@ static void iwl_mvm_te_handle_notif(struct iwl_mvm *mvm, 
static int iwl_mvm_aux_roc_te_handle_notif(struct iwl_mvm *mvm,

					   struct iwl_time_event_notif *notif)

{

	struct iwl_mvm_time_event_data *te_data, *tmp;

	bool aux_roc_te = false;

	struct iwl_mvm_time_event_data *aux_roc_te = NULL, *te_data;



	list_for_each_entry_safe(te_data, tmp, &mvm->aux_roc_te_list, list) {

	list_for_each_entry(te_data, &mvm->aux_roc_te_list, list) {

		if (le32_to_cpu(notif->unique_id) == te_data->uid) {

			aux_roc_te = true;

			aux_roc_te = te_data;

			break;

		}

	}