From: An Ha Date: Wed, 3 Sep 2014 01:00:43 +0000 (-0400) Subject: Staging: rtl8821ae: hal_bt_coexist: add/remove spaces X-Git-Tag: v3.18-rc1~130^2~755 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=77360f030d8bf74df7d4067ca2748b0dbec70c75;p=karo-tx-linux.git Staging: rtl8821ae: hal_bt_coexist: add/remove spaces Fix coding style issue which requires a space before the open curly brace '{', after the open parenthesis '(', after a comma, and after the equal sign '=' in an assignment. Also, remove unnecessary whitespace after open parenthesis '(' and before a quoted newline. Signed-off-by: An Ha Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8821ae/rtl8821ae/hal_bt_coexist.c b/drivers/staging/rtl8821ae/rtl8821ae/hal_bt_coexist.c index cff300c52b7d..40d521e751e2 100644 --- a/drivers/staging/rtl8821ae/rtl8821ae/hal_bt_coexist.c +++ b/drivers/staging/rtl8821ae/rtl8821ae/hal_bt_coexist.c @@ -43,13 +43,13 @@ void rtl8821ae_dm_bt_reject_ap_aggregated_packet(struct ieee80211_hw *hw, bool b struct rtl_priv rtlpriv = rtl_priv(hw); PRX_TS_RECORD pRxTs = NULL; - if(b_reject){ + if (b_reject) { /* Do not allow receiving A-MPDU aggregation. */ if (rtlpriv->mac80211.vendor == PEER_CISCO) { if (pHTInfo->bAcceptAddbaReq) { - RTPRINT(FBT, BT_TRACE, ("BT_Disallow AMPDU \n")); + RTPRINT(FBT, BT_TRACE, ("BT_Disallow AMPDU\n")); pHTInfo->bAcceptAddbaReq = FALSE; - if(GetTs(Adapter, (PTS_COMMON_INFO*)(&pRxTs), pMgntInfo->Bssid, 0, RX_DIR, FALSE)) + if (GetTs(Adapter, (PTS_COMMON_INFO*)(&pRxTs), pMgntInfo->Bssid, 0, RX_DIR, FALSE)) TsInitDelBA(Adapter, (PTS_COMMON_INFO)pRxTs, RX_DIR); } } else { @@ -59,9 +59,9 @@ void rtl8821ae_dm_bt_reject_ap_aggregated_packet(struct ieee80211_hw *hw, bool b } } } else { - if(rtlpriv->mac80211.vendor == PEER_CISCO) { + if (rtlpriv->mac80211.vendor == PEER_CISCO) { if (!pHTInfo->bAcceptAddbaReq) { - RTPRINT(FBT, BT_TRACE, ("BT_Allow AMPDU \n")); + RTPRINT(FBT, BT_TRACE, ("BT_Allow AMPDU\n")); pHTInfo->bAcceptAddbaReq = TRUE; } } @@ -78,13 +78,13 @@ struct rtl_phy *rtlphy = &(rtlpriv->phy); if (rtlpriv->link_info.b_busytraffic) { rtlpcipriv->btcoexist.current_state &= ~BT_COEX_STATE_WIFI_IDLE; - if(rtlpriv->link_info.b_tx_busy_traffic) { + if (rtlpriv->link_info.b_tx_busy_traffic) { rtlpcipriv->btcoexist.current_state |= BT_COEX_STATE_WIFI_UPLINK; } else { rtlpcipriv->btcoexist.current_state &= ~BT_COEX_STATE_WIFI_UPLINK; } - if(rtlpriv->link_info.b_rx_busy_traffic) { + if (rtlpriv->link_info.b_rx_busy_traffic) { rtlpcipriv->btcoexist.current_state |= BT_COEX_STATE_WIFI_DOWNLINK; } else { rtlpcipriv->btcoexist.current_state &= ~BT_COEX_STATE_WIFI_DOWNLINK; @@ -102,7 +102,7 @@ if (rtlpriv->mac80211.mode == WIRELESS_MODE_G rtlpcipriv->btcoexist.current_state &= ~BT_COEX_STATE_WIFI_HT40; } else { rtlpcipriv->btcoexist.current_state &= ~BT_COEX_STATE_WIFI_LEGACY; - if(rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40) { + if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40) { rtlpcipriv->btcoexist.current_state |= BT_COEX_STATE_WIFI_HT40; rtlpcipriv->btcoexist.current_state &= ~BT_COEX_STATE_WIFI_HT20; } else { @@ -130,12 +130,12 @@ u8 rtl8821ae_dm_bt_check_coex_rssi_state1(struct ieee80211_hw *hw, undecoratedsmoothed_pwdb = rtl8821ae_dm_bt_get_rx_ss(hw); - if(level_num == 2) { + if (level_num == 2) { rtlpcipriv->btcoexist.current_state &= ~BT_COEX_STATE_WIFI_RSSI_1_MEDIUM; - if( (rtlpcipriv->btcoexist.bt_pre_rssi_state == BT_RSSI_STATE_LOW) || + if ((rtlpcipriv->btcoexist.bt_pre_rssi_state == BT_RSSI_STATE_LOW) || (rtlpcipriv->btcoexist.bt_pre_rssi_state == BT_RSSI_STATE_STAY_LOW)) { - if(undecoratedsmoothed_pwdb >= (rssi_thresh + BT_FW_COEX_THRESH_TOL)) { + if (undecoratedsmoothed_pwdb >= (rssi_thresh + BT_FW_COEX_THRESH_TOL)) { bt_rssi_state = BT_RSSI_STATE_HIGH; rtlpcipriv->btcoexist.current_state |= BT_COEX_STATE_WIFI_RSSI_1_HIGH; rtlpcipriv->btcoexist.current_state &= ~BT_COEX_STATE_WIFI_RSSI_1_LOW; @@ -145,7 +145,7 @@ u8 rtl8821ae_dm_bt_check_coex_rssi_state1(struct ieee80211_hw *hw, RT_TRACE(COMP_BT_COEXIST, DBG_TRACE, ("[DM][BT], RSSI_1 state stay at Low\n")); } } else { - if(undecoratedsmoothed_pwdb < rssi_thresh) { + if (undecoratedsmoothed_pwdb < rssi_thresh) { bt_rssi_state = BT_RSSI_STATE_LOW; rtlpcipriv->btcoexist.current_state |= BT_COEX_STATE_WIFI_RSSI_1_LOW; rtlpcipriv->btcoexist.current_state &= ~BT_COEX_STATE_WIFI_RSSI_1_HIGH; @@ -155,15 +155,15 @@ u8 rtl8821ae_dm_bt_check_coex_rssi_state1(struct ieee80211_hw *hw, RT_TRACE(COMP_BT_COEXIST, DBG_TRACE, ("[DM][BT], RSSI_1 state stay at High\n")); } } - } else if(level_num == 3) { - if(rssi_thresh > rssi_thresh1) { + } else if (level_num == 3) { + if (rssi_thresh > rssi_thresh1) { RT_TRACE(COMP_BT_COEXIST, DBG_TRACE, ("[DM][BT], RSSI_1 thresh error!!\n")); return rtlpcipriv->btcoexist.bt_pre_rssi_state; } - if( (rtlpcipriv->btcoexist.bt_pre_rssi_state == BT_RSSI_STATE_LOW) || + if ((rtlpcipriv->btcoexist.bt_pre_rssi_state == BT_RSSI_STATE_LOW) || (rtlpcipriv->btcoexist.bt_pre_rssi_state == BT_RSSI_STATE_STAY_LOW)) { - if(undecoratedsmoothed_pwdb >= (rssi_thresh+BT_FW_COEX_THRESH_TOL)) { + if (undecoratedsmoothed_pwdb >= (rssi_thresh+BT_FW_COEX_THRESH_TOL)) { bt_rssi_state = BT_RSSI_STATE_MEDIUM; rtlpcipriv->btcoexist.current_state |= BT_COEX_STATE_WIFI_RSSI_1_MEDIUM; rtlpcipriv->btcoexist.current_state &= ~BT_COEX_STATE_WIFI_RSSI_1_LOW; @@ -173,15 +173,15 @@ u8 rtl8821ae_dm_bt_check_coex_rssi_state1(struct ieee80211_hw *hw, bt_rssi_state = BT_RSSI_STATE_STAY_LOW; RT_TRACE(COMP_BT_COEXIST, DBG_TRACE, ("[DM][BT], RSSI_1 state stay at Low\n")); } - } else if( (rtlpcipriv->btcoexist.bt_pre_rssi_state == BT_RSSI_STATE_MEDIUM) || + } else if ((rtlpcipriv->btcoexist.bt_pre_rssi_state == BT_RSSI_STATE_MEDIUM) || (rtlpcipriv->btcoexist.bt_pre_rssi_state == BT_RSSI_STATE_STAY_MEDIUM)) { - if(undecoratedsmoothed_pwdb >= (rssi_thresh1 + BT_FW_COEX_THRESH_TOL)) { + if (undecoratedsmoothed_pwdb >= (rssi_thresh1 + BT_FW_COEX_THRESH_TOL)) { bt_rssi_state = BT_RSSI_STATE_HIGH; rtlpcipriv->btcoexist.current_state |= BT_COEX_STATE_WIFI_RSSI_1_HIGH; rtlpcipriv->btcoexist.current_state &= ~BT_COEX_STATE_WIFI_RSSI_1_LOW; rtlpcipriv->btcoexist.current_state &= ~BT_COEX_STATE_WIFI_RSSI_1_MEDIUM; RT_TRACE(COMP_BT_COEXIST, DBG_TRACE, ("[DM][BT], RSSI_1 state switch to High\n")); - } else if(undecoratedsmoothed_pwdb < rssi_thresh) { + } else if (undecoratedsmoothed_pwdb < rssi_thresh) { bt_rssi_state = BT_RSSI_STATE_LOW; rtlpcipriv->btcoexist.current_state |= BT_COEX_STATE_WIFI_RSSI_1_LOW; rtlpcipriv->btcoexist.current_state &= ~BT_COEX_STATE_WIFI_RSSI_1_HIGH; @@ -192,12 +192,12 @@ u8 rtl8821ae_dm_bt_check_coex_rssi_state1(struct ieee80211_hw *hw, RT_TRACE(COMP_BT_COEXIST, DBG_TRACE, ("[DM][BT], RSSI_1 state stay at Medium\n")); } } else { - if(undecoratedsmoothed_pwdb < rssi_thresh1) { + if (undecoratedsmoothed_pwdb < rssi_thresh1) { bt_rssi_state = BT_RSSI_STATE_MEDIUM; rtlpcipriv->btcoexist.current_state |= BT_COEX_STATE_WIFI_RSSI_1_MEDIUM; rtlpcipriv->btcoexist.current_state &= ~BT_COEX_STATE_WIFI_RSSI_1_HIGH; rtlpcipriv->btcoexist.current_state &= ~BT_COEX_STATE_WIFI_RSSI_1_LOW; - RT_TRACE(COMP_BT_COEXIST, DBG_TRACE,("[DM][BT], RSSI_1 state switch to Medium\n")); + RT_TRACE(COMP_BT_COEXIST, DBG_TRACE, ("[DM][BT], RSSI_1 state switch to Medium\n")); } else { bt_rssi_state = BT_RSSI_STATE_STAY_HIGH; RT_TRACE(COMP_BT_COEXIST, DBG_TRACE, ("[DM][BT], RSSI_1 state stay at High\n")); @@ -224,7 +224,7 @@ u8 rtl8821ae_dm_bt_check_coex_rssi_state(struct ieee80211_hw *hw, rtlpcipriv->btcoexist.current_state &= ~BT_COEX_STATE_WIFI_RSSI_MEDIUM; if ((rtlpcipriv->btcoexist.bt_pre_rssi_state == BT_RSSI_STATE_LOW) || - (rtlpcipriv->btcoexist.bt_pre_rssi_state == BT_RSSI_STATE_STAY_LOW)){ + (rtlpcipriv->btcoexist.bt_pre_rssi_state == BT_RSSI_STATE_STAY_LOW)) { if (undecoratedsmoothed_pwdb >= (rssi_thresh + BT_FW_COEX_THRESH_TOL)) { bt_rssi_state = BT_RSSI_STATE_HIGH; @@ -263,7 +263,7 @@ u8 rtl8821ae_dm_bt_check_coex_rssi_state(struct ieee80211_hw *hw, } if ((rtlpcipriv->btcoexist.bt_pre_rssi_state == BT_RSSI_STATE_LOW) || (rtlpcipriv->btcoexist.bt_pre_rssi_state == BT_RSSI_STATE_STAY_LOW)) { - if(undecoratedsmoothed_pwdb + if (undecoratedsmoothed_pwdb >= (rssi_thresh + BT_FW_COEX_THRESH_TOL)) { bt_rssi_state = BT_RSSI_STATE_MEDIUM; rtlpcipriv->btcoexist.current_state @@ -292,7 +292,7 @@ u8 rtl8821ae_dm_bt_check_coex_rssi_state(struct ieee80211_hw *hw, &= ~BT_COEX_STATE_WIFI_RSSI_MEDIUM; RT_TRACE(COMP_BT_COEXIST, DBG_TRACE, ("[DM][BT], RSSI state switch to High\n")); - } else if(undecoratedsmoothed_pwdb < rssi_thresh) + } else if (undecoratedsmoothed_pwdb < rssi_thresh) { bt_rssi_state = BT_RSSI_STATE_LOW; rtlpcipriv->btcoexist.current_state @@ -309,7 +309,7 @@ u8 rtl8821ae_dm_bt_check_coex_rssi_state(struct ieee80211_hw *hw, ("[DM][BT], RSSI state stay at Medium\n")); } } else { - if(undecoratedsmoothed_pwdb < rssi_thresh1) { + if (undecoratedsmoothed_pwdb < rssi_thresh1) { bt_rssi_state = BT_RSSI_STATE_MEDIUM; rtlpcipriv->btcoexist.current_state |= BT_COEX_STATE_WIFI_RSSI_MEDIUM; @@ -352,7 +352,7 @@ void rtl8821ae_dm_bt_balance(struct ieee80211_hw *hw, { struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw); struct rtl_priv *rtlpriv = rtl_priv(hw); - u8 h2c_parameter[3] ={0}; + u8 h2c_parameter[3] = {0}; if (b_balance_on) { h2c_parameter[2] = 1; @@ -382,11 +382,11 @@ void rtl8821ae_dm_bt_agc_table(struct ieee80211_hw *hw, u8 type) if (type == BT_AGCTABLE_OFF) { RT_TRACE(COMP_BT_COEXIST, DBG_TRACE, ("[BT]AGCTable Off!\n")); - rtl_write_dword(rtlpriv, 0xc78,0x641c0001); - rtl_write_dword(rtlpriv, 0xc78,0x631d0001); - rtl_write_dword(rtlpriv, 0xc78,0x621e0001); - rtl_write_dword(rtlpriv, 0xc78,0x611f0001); - rtl_write_dword(rtlpriv, 0xc78,0x60200001); + rtl_write_dword(rtlpriv, 0xc78, 0x641c0001); + rtl_write_dword(rtlpriv, 0xc78, 0x631d0001); + rtl_write_dword(rtlpriv, 0xc78, 0x621e0001); + rtl_write_dword(rtlpriv, 0xc78, 0x611f0001); + rtl_write_dword(rtlpriv, 0xc78, 0x60200001); rtl8821ae_phy_set_rf_reg(hw, RF90_PATH_A, RF_RX_AGC_HP, 0xfffff, 0x32000); @@ -400,11 +400,11 @@ void rtl8821ae_dm_bt_agc_table(struct ieee80211_hw *hw, u8 type) RF_RX_G1, 0xfffff, 0x30355); } else if (type == BT_AGCTABLE_ON) { RT_TRACE(COMP_BT_COEXIST, DBG_TRACE, ("[BT]AGCTable On!\n")); - rtl_write_dword(rtlpriv, 0xc78,0x4e1c0001); - rtl_write_dword(rtlpriv, 0xc78,0x4d1d0001); - rtl_write_dword(rtlpriv, 0xc78,0x4c1e0001); - rtl_write_dword(rtlpriv, 0xc78,0x4b1f0001); - rtl_write_dword(rtlpriv, 0xc78,0x4a200001); + rtl_write_dword(rtlpriv, 0xc78, 0x4e1c0001); + rtl_write_dword(rtlpriv, 0xc78, 0x4d1d0001); + rtl_write_dword(rtlpriv, 0xc78, 0x4c1e0001); + rtl_write_dword(rtlpriv, 0xc78, 0x4b1f0001); + rtl_write_dword(rtlpriv, 0xc78, 0x4a200001); rtl8821ae_phy_set_rf_reg(hw, RF90_PATH_A, RF_RX_AGC_HP, 0xfffff, 0xdc000); @@ -428,10 +428,10 @@ void rtl8821ae_dm_bt_bb_back_off_level(struct ieee80211_hw *hw, u8 type) if (type == BT_BB_BACKOFF_OFF) { RT_TRACE(COMP_BT_COEXIST, DBG_TRACE, ("[BT]BBBackOffLevel Off!\n")); - rtl_write_dword(rtlpriv, 0xc04,0x3a05611); + rtl_write_dword(rtlpriv, 0xc04, 0x3a05611); } else if (type == BT_BB_BACKOFF_ON) { RT_TRACE(COMP_BT_COEXIST, DBG_TRACE, ("[BT]BBBackOffLevel On!\n")); - rtl_write_dword(rtlpriv, 0xc04,0x3a07611); + rtl_write_dword(rtlpriv, 0xc04, 0x3a07611); rtlpcipriv->btcoexist.b_sw_coexist_all_off = false; } } @@ -443,7 +443,7 @@ void rtl8821ae_dm_bt_fw_coex_all_off(struct ieee80211_hw *hw) RT_TRACE(COMP_BT_COEXIST, DBG_TRACE, ("rtl8821ae_dm_bt_fw_coex_all_off()\n")); - if(rtlpcipriv->btcoexist.b_fw_coexist_all_off) + if (rtlpcipriv->btcoexist.b_fw_coexist_all_off) return; RT_TRACE(COMP_BT_COEXIST, DBG_TRACE, @@ -460,7 +460,7 @@ void rtl8821ae_dm_bt_sw_coex_all_off(struct ieee80211_hw *hw) RT_TRACE(COMP_BT_COEXIST, DBG_TRACE, ("rtl8821ae_dm_bt_sw_coex_all_off()\n")); - if(rtlpcipriv->btcoexist.b_sw_coexist_all_off) + if (rtlpcipriv->btcoexist.b_sw_coexist_all_off) return; RT_TRACE(COMP_BT_COEXIST, DBG_TRACE, @@ -477,7 +477,7 @@ void rtl8821ae_dm_bt_hw_coex_all_off(struct ieee80211_hw *hw) RT_TRACE(COMP_BT_COEXIST, DBG_TRACE, ("rtl8821ae_dm_bt_hw_coex_all_off()\n")); - if(rtlpcipriv->btcoexist.b_hw_coexist_all_off) + if (rtlpcipriv->btcoexist.b_hw_coexist_all_off) return; RT_TRACE(COMP_BT_COEXIST, DBG_TRACE, ("rtl8821ae_dm_bt_hw_coex_all_off(), real Do\n")); @@ -498,7 +498,7 @@ bool rtl8821ae_dm_bt_is_coexist_state_changed(struct ieee80211_hw *hw) { struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw); - if((rtlpcipriv->btcoexist.previous_state + if ((rtlpcipriv->btcoexist.previous_state == rtlpcipriv->btcoexist.current_state) && (rtlpcipriv->btcoexist.previous_state_h == rtlpcipriv->btcoexist.current_state_h))