UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Nicholas Krause <xerofoify@gmail.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
This commit is contained in:
Nicholas Krause 2015-07-08 11:02:15 -04:00 committed by Emmanuel Grumbach
parent ca8c0f4bed
commit 48ed704031
1 changed files with 21 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/net/wireless/iwlwifi/dvm/rs.c
View File

@ -1416,7 +1416,7 @@ 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,
@ -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,14 +1584,12 @@ out:
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)
@ -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,14 +1754,12 @@ 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)
@ -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,14 +1922,12 @@ 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)
@ -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,
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;
} }
/* /*