Fix coding style issues, these changes include:
-Add space between "if" and brackets
-Add space after comma in an argument
-Add space between equal sign to separate the variable and the assignment
-Remove unnecessary curly braces around one-line if statements
-Remove unnecessary whitespace between two brackets
-Remove unnecessary whitespace before newline
-Join else-if statement onto same line as end curly brace
-Join open curly brace onto same line as if statement
-Use "foo *" instead of "foo*" for the pointer placement
-Switch commenting style from C99 comments to C89 comments

Signed-off-by: An Ha <zero579...@gmail.com>
---
 .../staging/rtl8821ae/rtl8821ae/hal_bt_coexist.c   | 102 ++++++++++-----------
 1 file changed, 49 insertions(+), 53 deletions(-)

diff --git a/drivers/staging/rtl8821ae/rtl8821ae/hal_bt_coexist.c 
b/drivers/staging/rtl8821ae/rtl8821ae/hal_bt_coexist.c
index 8bee772..293bf9d 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){
-               // Do not allow receiving A-MPDU aggregation.
+       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,17 +78,15 @@ 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 {
+       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 {
+       else
                rtlpcipriv->btcoexist.current_state &= 
~BT_COEX_STATE_WIFI_DOWNLINK;
-       }
 } else {
        rtlpcipriv->btcoexist.current_state |= BT_COEX_STATE_WIFI_IDLE;
        rtlpcipriv->btcoexist.current_state &= ~BT_COEX_STATE_WIFI_UPLINK;
@@ -102,7 +100,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 {
@@ -111,12 +109,11 @@ if (rtlpriv->mac80211.mode == WIRELESS_MODE_G
        }
 }
 
-if (bt_operation_on) {
+if (bt_operation_on)
        rtlpcipriv->btcoexist.current_state |= BT_COEX_STATE_BT30;
-} else {
+else
        rtlpcipriv->btcoexist.current_state &= ~BT_COEX_STATE_BT30;
 }
-}
 
 
 u8 rtl8821ae_dm_bt_check_coex_rssi_state1(struct ieee80211_hw *hw,
@@ -130,12 +127,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 +142,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 +152,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 +170,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 +189,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 +221,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;
@@ -254,8 +251,7 @@ u8 rtl8821ae_dm_bt_check_coex_rssi_state(struct 
ieee80211_hw *hw,
                                        ("[DM][BT], RSSI state stay at 
High\n"));
                        }
                }
-       }
-       else if (level_num == 3) {
+       } else if (level_num == 3) {
                if (rssi_thresh > rssi_thresh1) {
                        RT_TRACE(COMP_BT_COEXIST, DBG_TRACE,
                                ("[DM][BT], RSSI thresh error!!\n"));
@@ -263,7 +259,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,8 +288,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
                                        |= BT_COEX_STATE_WIFI_RSSI_LOW;
@@ -309,7 +304,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 +347,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 +377,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 +395,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 +423,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;
        }
 }
@@ -440,10 +435,11 @@ void rtl8821ae_dm_bt_fw_coex_all_off(struct ieee80211_hw 
*hw)
 {
        struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
        struct rtl_priv *rtlpriv = rtl_priv(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 +456,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 +473,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 +494,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))
-- 
2.1.0

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to