Staging: rtl8821ae: hal_bt_coexist: fix curly brace placement
authorAn Ha <zero579911@gmail.com>
Wed, 3 Sep 2014 01:00:45 +0000 (21:00 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 Sep 2014 20:45:23 +0000 (13:45 -0700)
Fix coding style issue where the if statement unnecessarily uses curly
braces for one line statements and where the else conditional statement
should follow the closing curly brace '}'. Also, the open curly brace
'{' should be on the same line as the if statement.

Signed-off-by: An Ha <zero579911@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8821ae/rtl8821ae/hal_bt_coexist.c

index 13cc5ba3edbc8b66bd9eae0952523dea8d33d67f..d587072623f89aa4e183cfb869398af7bf6c234f 100644 (file)
@@ -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;
@@ -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,
@@ -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"));
@@ -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;