From c8dbab964ff3b89883369a8b176f3e44ad4e34e4 Mon Sep 17 00:00:00 2001 From: An Ha Date: Tue, 2 Sep 2014 21:00:45 -0400 Subject: [PATCH] Staging: rtl8821ae: hal_bt_coexist: fix curly brace placement 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 Signed-off-by: Greg Kroah-Hartman --- .../rtl8821ae/rtl8821ae/hal_bt_coexist.c | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/drivers/staging/rtl8821ae/rtl8821ae/hal_bt_coexist.c b/drivers/staging/rtl8821ae/rtl8821ae/hal_bt_coexist.c index 13cc5ba3edbc..d587072623f8 100644 --- a/drivers/staging/rtl8821ae/rtl8821ae/hal_bt_coexist.c +++ b/drivers/staging/rtl8821ae/rtl8821ae/hal_bt_coexist.c @@ -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; -- 2.34.1