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

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
...@@ -1416,11 +1416,11 @@ static int rs_switch_to_siso(struct iwl_priv *priv, ...@@ -1416,11 +1416,11 @@ static int rs_switch_to_siso(struct iwl_priv *priv,
/* /*
* Try to switch to new modulation mode from legacy * 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 iwl_lq_sta *lq_sta,
struct ieee80211_conf *conf, struct ieee80211_conf *conf,
struct ieee80211_sta *sta, struct ieee80211_sta *sta,
int index) int index)
{ {
struct iwl_scale_tbl_info *tbl = &(lq_sta->lq_info[lq_sta->active_tbl]); struct iwl_scale_tbl_info *tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
struct iwl_scale_tbl_info *search_tbl = struct iwl_scale_tbl_info *search_tbl =
...@@ -1575,7 +1575,7 @@ static int rs_move_legacy_other(struct iwl_priv *priv, ...@@ -1575,7 +1575,7 @@ static int rs_move_legacy_other(struct iwl_priv *priv,
} }
search_tbl->lq_type = LQ_NONE; search_tbl->lq_type = LQ_NONE;
return 0; return;
out: out:
lq_sta->search_better_tbl = 1; lq_sta->search_better_tbl = 1;
...@@ -1584,17 +1584,15 @@ static int rs_move_legacy_other(struct iwl_priv *priv, ...@@ -1584,17 +1584,15 @@ static int rs_move_legacy_other(struct iwl_priv *priv,
tbl->action = IWL_LEGACY_SWITCH_ANTENNA1; tbl->action = IWL_LEGACY_SWITCH_ANTENNA1;
if (update_search_tbl_counter) if (update_search_tbl_counter)
search_tbl->action = tbl->action; search_tbl->action = tbl->action;
return 0;
} }
/* /*
* Try to switch to new modulation mode from SISO * 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 iwl_lq_sta *lq_sta,
struct ieee80211_conf *conf, struct ieee80211_conf *conf,
struct ieee80211_sta *sta, int index) struct ieee80211_sta *sta, int index)
{ {
u8 is_green = lq_sta->is_green; u8 is_green = lq_sta->is_green;
struct iwl_scale_tbl_info *tbl = &(lq_sta->lq_info[lq_sta->active_tbl]); struct iwl_scale_tbl_info *tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
...@@ -1747,7 +1745,7 @@ static int rs_move_siso_to_other(struct iwl_priv *priv, ...@@ -1747,7 +1745,7 @@ static int rs_move_siso_to_other(struct iwl_priv *priv,
break; break;
} }
search_tbl->lq_type = LQ_NONE; search_tbl->lq_type = LQ_NONE;
return 0; return;
out: out:
lq_sta->search_better_tbl = 1; lq_sta->search_better_tbl = 1;
...@@ -1756,17 +1754,15 @@ static int rs_move_siso_to_other(struct iwl_priv *priv, ...@@ -1756,17 +1754,15 @@ static int rs_move_siso_to_other(struct iwl_priv *priv,
tbl->action = IWL_SISO_SWITCH_ANTENNA1; tbl->action = IWL_SISO_SWITCH_ANTENNA1;
if (update_search_tbl_counter) if (update_search_tbl_counter)
search_tbl->action = tbl->action; search_tbl->action = tbl->action;
return 0;
} }
/* /*
* Try to switch to new modulation mode from MIMO2 * 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 iwl_lq_sta *lq_sta,
struct ieee80211_conf *conf, struct ieee80211_conf *conf,
struct ieee80211_sta *sta, int index) struct ieee80211_sta *sta, int index)
{ {
s8 is_green = lq_sta->is_green; s8 is_green = lq_sta->is_green;
struct iwl_scale_tbl_info *tbl = &(lq_sta->lq_info[lq_sta->active_tbl]); struct iwl_scale_tbl_info *tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
...@@ -1917,7 +1913,7 @@ static int rs_move_mimo2_to_other(struct iwl_priv *priv, ...@@ -1917,7 +1913,7 @@ static int rs_move_mimo2_to_other(struct iwl_priv *priv,
break; break;
} }
search_tbl->lq_type = LQ_NONE; search_tbl->lq_type = LQ_NONE;
return 0; return;
out: out:
lq_sta->search_better_tbl = 1; lq_sta->search_better_tbl = 1;
tbl->action++; tbl->action++;
...@@ -1926,17 +1922,15 @@ static int rs_move_mimo2_to_other(struct iwl_priv *priv, ...@@ -1926,17 +1922,15 @@ static int rs_move_mimo2_to_other(struct iwl_priv *priv,
if (update_search_tbl_counter) if (update_search_tbl_counter)
search_tbl->action = tbl->action; search_tbl->action = tbl->action;
return 0;
} }
/* /*
* Try to switch to new modulation mode from MIMO3 * 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 iwl_lq_sta *lq_sta,
struct ieee80211_conf *conf, struct ieee80211_conf *conf,
struct ieee80211_sta *sta, int index) struct ieee80211_sta *sta, int index)
{ {
s8 is_green = lq_sta->is_green; s8 is_green = lq_sta->is_green;
struct iwl_scale_tbl_info *tbl = &(lq_sta->lq_info[lq_sta->active_tbl]); struct iwl_scale_tbl_info *tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
...@@ -2093,7 +2087,7 @@ static int rs_move_mimo3_to_other(struct iwl_priv *priv, ...@@ -2093,7 +2087,7 @@ static int rs_move_mimo3_to_other(struct iwl_priv *priv,
break; break;
} }
search_tbl->lq_type = LQ_NONE; search_tbl->lq_type = LQ_NONE;
return 0; return;
out: out:
lq_sta->search_better_tbl = 1; lq_sta->search_better_tbl = 1;
tbl->action++; tbl->action++;
...@@ -2101,9 +2095,6 @@ static int rs_move_mimo3_to_other(struct iwl_priv *priv, ...@@ -2101,9 +2095,6 @@ static int rs_move_mimo3_to_other(struct iwl_priv *priv,
tbl->action = IWL_MIMO3_SWITCH_ANTENNA1; tbl->action = IWL_MIMO3_SWITCH_ANTENNA1;
if (update_search_tbl_counter) if (update_search_tbl_counter)
search_tbl->action = tbl->action; search_tbl->action = tbl->action;
return 0;
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment