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

Commit 48ed7040 authored by Nicholas Krause's avatar Nicholas Krause Committed by Emmanuel Grumbach
Browse files

iwlwifi: make various functions void in the file rs.c 



This makes various functions in the file rs.c void due to these
functions never returning a error code to signal to their callers
if and how they have failed to complete their intended work.

Signed-off-by: default avatarNicholas Krause <xerofoify@gmail.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent ca8c0f4b

drivers/net/wireless/iwlwifi/dvm/rs.c

+21 −30
Original line number Diff line number Diff line
@@ -1416,7 +1416,7 @@ static int rs_switch_to_siso(struct iwl_priv *priv, 
/*

 * Try to switch to new modulation mode from legacy

 */

static int rs_move_legacy_other(struct iwl_priv *priv,

static void rs_move_legacy_other(struct iwl_priv *priv,

				 struct iwl_lq_sta *lq_sta,

				 struct ieee80211_conf *conf,

				 struct ieee80211_sta *sta,
@@ -1575,7 +1575,7 @@ static int rs_move_legacy_other(struct iwl_priv *priv, 


	}

	search_tbl->lq_type = LQ_NONE;

	return 0;

	return;



out:

	lq_sta->search_better_tbl = 1;
@@ -1584,14 +1584,12 @@ static int rs_move_legacy_other(struct iwl_priv *priv, 
		tbl->action = IWL_LEGACY_SWITCH_ANTENNA1;

	if (update_search_tbl_counter)

		search_tbl->action = tbl->action;

	return 0;



}



/*

 * Try to switch to new modulation mode from SISO

 */

static int rs_move_siso_to_other(struct iwl_priv *priv,

static void rs_move_siso_to_other(struct iwl_priv *priv,

				  struct iwl_lq_sta *lq_sta,

				  struct ieee80211_conf *conf,

				  struct ieee80211_sta *sta, int index)
@@ -1747,7 +1745,7 @@ static int rs_move_siso_to_other(struct iwl_priv *priv, 
			break;

	}

	search_tbl->lq_type = LQ_NONE;

	return 0;

	return;



 out:

	lq_sta->search_better_tbl = 1;
@@ -1756,14 +1754,12 @@ static int rs_move_siso_to_other(struct iwl_priv *priv, 
		tbl->action = IWL_SISO_SWITCH_ANTENNA1;

	if (update_search_tbl_counter)

		search_tbl->action = tbl->action;



	return 0;

}



/*

 * Try to switch to new modulation mode from MIMO2

 */

static int rs_move_mimo2_to_other(struct iwl_priv *priv,

static void rs_move_mimo2_to_other(struct iwl_priv *priv,

				   struct iwl_lq_sta *lq_sta,

				   struct ieee80211_conf *conf,

				   struct ieee80211_sta *sta, int index)
@@ -1917,7 +1913,7 @@ static int rs_move_mimo2_to_other(struct iwl_priv *priv, 
			break;

	}

	search_tbl->lq_type = LQ_NONE;

	return 0;

	return;

 out:

	lq_sta->search_better_tbl = 1;

	tbl->action++;
@@ -1926,14 +1922,12 @@ static int rs_move_mimo2_to_other(struct iwl_priv *priv, 
	if (update_search_tbl_counter)

		search_tbl->action = tbl->action;



	return 0;



}



/*

 * Try to switch to new modulation mode from MIMO3

 */

static int rs_move_mimo3_to_other(struct iwl_priv *priv,

static void rs_move_mimo3_to_other(struct iwl_priv *priv,

				   struct iwl_lq_sta *lq_sta,

				   struct ieee80211_conf *conf,

				   struct ieee80211_sta *sta, int index)
@@ -2093,7 +2087,7 @@ static int rs_move_mimo3_to_other(struct iwl_priv *priv, 
			break;

	}

	search_tbl->lq_type = LQ_NONE;

	return 0;

	return;

 out:

	lq_sta->search_better_tbl = 1;

	tbl->action++;
@@ -2101,9 +2095,6 @@ static int rs_move_mimo3_to_other(struct iwl_priv *priv, 
		tbl->action = IWL_MIMO3_SWITCH_ANTENNA1;

	if (update_search_tbl_counter)

		search_tbl->action = tbl->action;



	return 0;



}



/*