staging: rtl8723au: rtl8723a_bt-coexist.h: Be consistent and use BIT()

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/include/rtl8723a_bt-coexist.h b/drivers/staging/rtl8723au/include/rtl8723a_bt-coexist.h
index 1072f5e..154bb47 100644 (file)
--- a/drivers/staging/rtl8723au/include/rtl8723a_bt-coexist.h
+++ b/drivers/staging/rtl8723au/include/rtl8723a_bt-coexist.h
@@ -1363,11 +1363,11 @@ void BTDM_CheckBTIdleChange1Ant(struct rtw_adapter * padapter);
 /*  */
 /*  For old core stack before v251 */
 /*  */
-#define BT_RSSI_STATE_NORMAL_POWER     BIT0
-#define BT_RSSI_STATE_AMDPU_OFF                BIT1
-#define BT_RSSI_STATE_SPECIAL_LOW      BIT2
-#define BT_RSSI_STATE_BG_EDCA_LOW      BIT3
-#define BT_RSSI_STATE_TXPOWER_LOW      BIT4
+#define BT_RSSI_STATE_NORMAL_POWER     BIT(0)
+#define BT_RSSI_STATE_AMDPU_OFF                BIT(1)
+#define BT_RSSI_STATE_SPECIAL_LOW      BIT(2)
+#define BT_RSSI_STATE_BG_EDCA_LOW      BIT(3)
+#define BT_RSSI_STATE_TXPOWER_LOW      BIT(4)
 
 #define        BT_DACSWING_OFF                         0
 #define        BT_DACSWING_M4                          1
@@ -1411,61 +1411,61 @@ void BTDM_DiminishWiFi(struct rtw_adapter * Adapter, u8 bDACOn, u8 bInterruptOn,
 #define BT_FW_COEX_THRESH_55                           55
 #define BT_FW_COEX_THRESH_65                           65
 
-#define BT_COEX_STATE_BT30                                     BIT(0)
+#define BT_COEX_STATE_BT30                     BIT(0)
 #define BT_COEX_STATE_WIFI_HT20                        BIT(1)
 #define BT_COEX_STATE_WIFI_HT40                        BIT(2)
-#define BT_COEX_STATE_WIFI_LEGACY                      BIT(3)
+#define BT_COEX_STATE_WIFI_LEGACY              BIT(3)
 
 #define BT_COEX_STATE_WIFI_RSSI_LOW            BIT(4)
-#define BT_COEX_STATE_WIFI_RSSI_MEDIUM BIT(5)
+#define BT_COEX_STATE_WIFI_RSSI_MEDIUM         BIT(5)
 #define BT_COEX_STATE_WIFI_RSSI_HIGH           BIT(6)
 #define BT_COEX_STATE_DEC_BT_POWER             BIT(7)
 
 #define BT_COEX_STATE_WIFI_IDLE                        BIT(8)
-#define BT_COEX_STATE_WIFI_UPLINK                      BIT(9)
+#define BT_COEX_STATE_WIFI_UPLINK              BIT(9)
 #define BT_COEX_STATE_WIFI_DOWNLINK            BIT(10)
 
-#define BT_COEX_STATE_BT_INQ_PAGE      BIT(11)
-#define BT_COEX_STATE_BT_IDLE                          BIT(12)
+#define BT_COEX_STATE_BT_INQ_PAGE              BIT(11)
+#define BT_COEX_STATE_BT_IDLE                  BIT(12)
 #define BT_COEX_STATE_BT_UPLINK                        BIT(13)
 #define BT_COEX_STATE_BT_DOWNLINK              BIT(14)
 /*  */
 /*  Todo: Remove these definitions */
-#define BT_COEX_STATE_BT_PAN_IDLE                      BIT(15)
+#define BT_COEX_STATE_BT_PAN_IDLE              BIT(15)
 #define BT_COEX_STATE_BT_PAN_UPLINK            BIT(16)
-#define BT_COEX_STATE_BT_PAN_DOWNLINK  BIT(17)
+#define BT_COEX_STATE_BT_PAN_DOWNLINK          BIT(17)
 #define BT_COEX_STATE_BT_A2DP_IDLE             BIT(18)
 /*  */
-#define BT_COEX_STATE_BT_RSSI_LOW                      BIT(19)
+#define BT_COEX_STATE_BT_RSSI_LOW              BIT(19)
 
-#define BT_COEX_STATE_PROFILE_HID                      BIT(20)
+#define BT_COEX_STATE_PROFILE_HID              BIT(20)
 #define BT_COEX_STATE_PROFILE_A2DP             BIT(21)
-#define BT_COEX_STATE_PROFILE_PAN                      BIT(22)
-#define BT_COEX_STATE_PROFILE_SCO                      BIT(23)
+#define BT_COEX_STATE_PROFILE_PAN              BIT(22)
+#define BT_COEX_STATE_PROFILE_SCO              BIT(23)
 
 #define BT_COEX_STATE_WIFI_RSSI_1_LOW          BIT(24)
 #define BT_COEX_STATE_WIFI_RSSI_1_MEDIUM       BIT(25)
 #define BT_COEX_STATE_WIFI_RSSI_1_HIGH         BIT(26)
 
-#define BT_COEX_STATE_WIFI_RSSI_BEACON_LOW             BIT(27)
-#define BT_COEX_STATE_WIFI_RSSI_BEACON_MEDIUM          BIT(28)
-#define BT_COEX_STATE_WIFI_RSSI_BEACON_HIGH            BIT(29)
+#define BT_COEX_STATE_WIFI_RSSI_BEACON_LOW     BIT(27)
+#define BT_COEX_STATE_WIFI_RSSI_BEACON_MEDIUM  BIT(28)
+#define BT_COEX_STATE_WIFI_RSSI_BEACON_HIGH    BIT(29)
 
 
-#define BT_COEX_STATE_BTINFO_COMMON                            BIT30
-#define BT_COEX_STATE_BTINFO_B_HID_SCOESCO             BIT31
-#define BT_COEX_STATE_BTINFO_B_FTP_A2DP                        BIT32
+#define BT_COEX_STATE_BTINFO_COMMON            BIT(30)
+#define BT_COEX_STATE_BTINFO_B_HID_SCOESCO     BIT(31)
+#define BT_COEX_STATE_BTINFO_B_FTP_A2DP                BIT(32)
 
-#define BT_COEX_STATE_BT_CNT_LEVEL_0                           BIT33
-#define BT_COEX_STATE_BT_CNT_LEVEL_1                           BIT34
-#define BT_COEX_STATE_BT_CNT_LEVEL_2                           BIT35
-#define BT_COEX_STATE_BT_CNT_LEVEL_3                           BIT36
+#define BT_COEX_STATE_BT_CNT_LEVEL_0           BIT(33)
+#define BT_COEX_STATE_BT_CNT_LEVEL_1           BIT(34)
+#define BT_COEX_STATE_BT_CNT_LEVEL_2           BIT(35)
+#define BT_COEX_STATE_BT_CNT_LEVEL_3           BIT(36)
 
-#define BT_RSSI_STATE_HIGH                                     0
-#define BT_RSSI_STATE_MEDIUM                           1
-#define BT_RSSI_STATE_LOW                                      2
+#define BT_RSSI_STATE_HIGH                     0
+#define BT_RSSI_STATE_MEDIUM                   1
+#define BT_RSSI_STATE_LOW                      2
 #define BT_RSSI_STATE_STAY_HIGH                        3
-#define BT_RSSI_STATE_STAY_MEDIUM                      4
+#define BT_RSSI_STATE_STAY_MEDIUM              4
 #define BT_RSSI_STATE_STAY_LOW                 5
 
 #define        BT_AGCTABLE_OFF                         0