3.16.61-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Ben Hutchings ben@decadent.org.uk
Fix the compiler warnings:
drivers/staging/rtl8192ee/rtl8192ee/hw.c:524:4: warning: this 'if' clause does not guard... drivers/staging/rtl8192ee/rtl8192ee/hw.c:529:5: warning: this 'if' clause does not guard... drivers/staging/rtl8192ee/btcoexist/halbtc8821a2ant.c:2338:2: warning: this 'else' clause does not guard...
by changing the indentation of these statements to match the upstream code in drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c and drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c.
These were fixed upstream when the driver was removed from staging and re-added with some clean-ups.
Signed-off-by: Ben Hutchings ben@decadent.org.uk --- --- a/drivers/staging/rtl8192ee/rtl8192ee/hw.c +++ b/drivers/staging/rtl8192ee/rtl8192ee/hw.c @@ -523,17 +523,17 @@ void rtl92ee_set_hw_reg(struct ieee80211 fac = (1 << (fac + 2)); if (fac > 0xf) fac = 0xf; - for (i = 0; i < 4; i++) { + for (i = 0; i < 4; i++) { if ((reg[i] & 0xf0) > (fac << 4)) reg[i] = (reg[i] & 0x0f) | (fac << 4); if ((reg[i] & 0x0f) > fac) reg[i] = (reg[i] & 0xf0) | fac; - rtl_write_byte(rtlpriv, - (REG_AGGLEN_LMT + i), - reg[i]); - } - RT_TRACE(COMP_MLME, DBG_LOUD, - ("Set HW_VAR_AMPDU_FACTOR:%#x\n", fac)); + rtl_write_byte(rtlpriv, + (REG_AGGLEN_LMT + i), + reg[i]); + } + RT_TRACE(COMP_MLME, DBG_LOUD, + ("Set HW_VAR_AMPDU_FACTOR:%#x\n", fac)); } break; } case HW_VAR_AC_PARAM:{ --- a/drivers/staging/rtl8192ee/btcoexist/halbtc8821a2ant.c +++ b/drivers/staging/rtl8192ee/btcoexist/halbtc8821a2ant.c @@ -2339,8 +2339,8 @@ static void halbtc8821a2ant_action_pan_e halbtc8821a2ant_coex_table(btcoexist, NORMAL_EXEC, 0x55ff55ff, 0x5aff5aff, 0xffff, 0x3);
- if (BTC_WIFI_BW_HT40 == wifi_bw) { - /* fw mechanism */ + if (BTC_WIFI_BW_HT40 == wifi_bw) { + /* fw mechanism */ if ((bt_rssi_state == BTC_RSSI_STATE_HIGH) || (bt_rssi_state == BTC_RSSI_STATE_STAY_HIGH)) ps21a_tdma(btcoexist, NORMAL_EXEC, true, 1);