staging: rtl8192e: Replace BIT10 to BIT31 with BIT(10) to BIT(31)

Replace custom macros BIT10 to BIT31 with standard kernel macros BIT(10) to
BIT(31) to shorten code.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/294ff1d0b92a474a9ae0d48a54a9f99f14008053.1698042685.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h
index 80f44ffe00e68eaa6f8bbffbd5bf723e9a1a6bd1..1b444529b59c87391debc20ad09554a8b35b23d2 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h
@@ -61,12 +61,12 @@ enum _RTL8192PCI_HW {
 #define                CR_TE                                   0x04
        SIFS            = 0x03E,
        RCR                     = 0x044,
-#define RCR_ONLYERLPKT         BIT31
-#define RCR_CBSSID             BIT23
-#define        RCR_ADD3                BIT21
-#define RCR_AMF                        BIT20
-#define RCR_ADF                        BIT18
-#define RCR_AICV               BIT12
+#define RCR_ONLYERLPKT         BIT(31)
+#define RCR_CBSSID             BIT(23)
+#define        RCR_ADD3                BIT(21)
+#define RCR_AMF                        BIT(20)
+#define RCR_ADF                        BIT(18)
+#define RCR_AICV               BIT(12)
 #define        RCR_AB                  BIT(3)
 #define        RCR_AM                  BIT(2)
 #define        RCR_APM                 BIT(1)
@@ -102,14 +102,14 @@ enum _RTL8192PCI_HW {
 #define   SCR_NoSKMC                           BIT(5)
        SWREGULATOR     = 0x0BD,
        INTA_MASK               = 0x0f4,
-#define IMR_TBDOK                      BIT27
-#define IMR_TBDER                      BIT26
-#define IMR_TXFOVW                     BIT15
-#define IMR_TIMEOUT0                   BIT14
-#define IMR_BcnInt                     BIT13
-#define        IMR_RXFOVW                      BIT12
-#define IMR_RDU                                BIT11
-#define IMR_RXCMDOK                    BIT10
+#define IMR_TBDOK                      BIT(27)
+#define IMR_TBDER                      BIT(26)
+#define IMR_TXFOVW                     BIT(15)
+#define IMR_TIMEOUT0                   BIT(14)
+#define IMR_BcnInt                     BIT(13)
+#define        IMR_RXFOVW                      BIT(12)
+#define IMR_RDU                                BIT(11)
+#define IMR_RXCMDOK                    BIT(10)
 #define IMR_BDOK                       BIT(9)
 #define IMR_HIGHDOK                    BIT(8)
 #define        IMR_COMDOK                      BIT(7)
@@ -188,9 +188,9 @@ enum _RTL8192PCI_HW {
 #define RRSR_18M                               BIT(7)
 #define RRSR_24M                               BIT(8)
 #define RRSR_36M                               BIT(9)
-#define RRSR_48M                               BIT10
-#define RRSR_54M                               BIT11
-#define BRSR_AckShortPmb                       BIT23
+#define RRSR_48M                               BIT(10)
+#define RRSR_54M                               BIT(11)
+#define BRSR_AckShortPmb                       BIT(23)
        UFWP                    = 0x318,
        RATR0                   = 0x320,
 #define        RATR_1M                 0x00000001

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
index 76ec4ed967c461ba3714b6d706b0c4f7832d74e1..69298c7c129ad7d379f539286f206d345d48f32e 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
@@ -17,7 +17,7 @@ void rtl92e_cam_reset(struct net_device *dev)
 {
        u32 ulcommand = 0;
 
-       ulcommand |= BIT31 | BIT30;
+       ulcommand |= BIT(31) | BIT(30);
        rtl92e_writel(dev, RWCAM, ulcommand);
 }
 
@@ -89,13 +89,13 @@ void rtl92e_set_key(struct net_device *dev, u8 EntryNo, u8 KeyIndex,
        }
 
        if (DefaultKey)
-               usConfig |= BIT15 | (KeyType << 2);
+               usConfig |= BIT(15) | (KeyType << 2);
        else
-               usConfig |= BIT15 | (KeyType << 2) | KeyIndex;
+               usConfig |= BIT(15) | (KeyType << 2) | KeyIndex;
 
        for (i = 0; i < CAM_CONTENT_COUNT; i++) {
                TargetCommand  = i + CAM_CONTENT_COUNT * EntryNo;
-               TargetCommand |= BIT31 | BIT16;
+               TargetCommand |= BIT(31) | BIT(16);
 
                if (i == 0) {
                        TargetContent = (u32)(*(MacAddr + 0)) << 16 |

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
index e88963a4b1f1c65f0acd35d291815fafd293cb94..330dafd62656a02173b783b286ceee33e3cdf1de 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
@@ -292,25 +292,25 @@ static void _rtl92e_dm_check_rate_adaptive(struct net_device *dev)
                                     ht_info->bCurShortGI20MHz);
 
                pra->upper_rssi_threshold_ratr =
-                               (pra->upper_rssi_threshold_ratr & (~BIT31)) |
-                               ((bshort_gi_enabled) ? BIT31 : 0);
+                               (pra->upper_rssi_threshold_ratr & (~BIT(31))) |
+                               ((bshort_gi_enabled) ? BIT(31) : 0);
 
                pra->middle_rssi_threshold_ratr =
-                               (pra->middle_rssi_threshold_ratr & (~BIT31)) |
-                               ((bshort_gi_enabled) ? BIT31 : 0);
+                               (pra->middle_rssi_threshold_ratr & (~BIT(31))) |
+                               ((bshort_gi_enabled) ? BIT(31) : 0);
 
                if (priv->current_chnl_bw != HT_CHANNEL_WIDTH_20) {
                        pra->low_rssi_threshold_ratr =
-                               (pra->low_rssi_threshold_ratr_40M & (~BIT31)) |
-                               ((bshort_gi_enabled) ? BIT31 : 0);
+                               (pra->low_rssi_threshold_ratr_40M & (~BIT(31))) |
+                               ((bshort_gi_enabled) ? BIT(31) : 0);
                } else {
                        pra->low_rssi_threshold_ratr =
-                               (pra->low_rssi_threshold_ratr_20M & (~BIT31)) |
-                               ((bshort_gi_enabled) ? BIT31 : 0);
+                               (pra->low_rssi_threshold_ratr_20M & (~BIT(31))) |
+                               ((bshort_gi_enabled) ? BIT(31) : 0);
                }
                pra->ping_rssi_ratr =
-                               (pra->ping_rssi_ratr & (~BIT31)) |
-                               ((bshort_gi_enabled) ? BIT31 : 0);
+                               (pra->ping_rssi_ratr & (~BIT(31))) |
+                               ((bshort_gi_enabled) ? BIT(31) : 0);
 
                if (pra->ratr_state == DM_RATR_STA_HIGH) {
                        high_rssi_thresh_for_ra = pra->high2low_rssi_thresh_for_ra;

diff --git a/drivers/staging/rtl8192e/rtl819x_Qos.h b/drivers/staging/rtl8192e/rtl819x_Qos.h
index 519a3160933b542c77a84e1b55ee2a948bdf58da..a43a5142e96fc3080ec362d6a1774c9f17f7c3f4 100644 (file)
--- a/drivers/staging/rtl8192e/rtl819x_Qos.h
+++ b/drivers/staging/rtl8192e/rtl819x_Qos.h
@@ -7,29 +7,6 @@
 #ifndef __INC_QOS_TYPE_H
 #define __INC_QOS_TYPE_H
 
-#define BIT10             0x00000400
-#define BIT11             0x00000800
-#define BIT12             0x00001000
-#define BIT13             0x00002000
-#define BIT14             0x00004000
-#define BIT15             0x00008000
-#define BIT16             0x00010000
-#define BIT17             0x00020000
-#define BIT18             0x00040000
-#define BIT19             0x00080000
-#define BIT20             0x00100000
-#define BIT21             0x00200000
-#define BIT22             0x00400000
-#define BIT23             0x00800000
-#define BIT24             0x01000000
-#define BIT25             0x02000000
-#define BIT26             0x04000000
-#define BIT27             0x08000000
-#define BIT28             0x10000000
-#define BIT29             0x20000000
-#define BIT30             0x40000000
-#define BIT31             0x80000000
-
 union qos_tsinfo {
        u8              charData[3];
        struct {

diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index 7f0aa0779c78ec3297e92f5ca98e83eb86b5188e..dc3488d9693fd3f992765b675742cd15b921c874 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -1085,10 +1085,10 @@ struct rt_pwr_save_ctrl {
 
 #define RT_RF_CHANGE_SOURCE u32
 
-#define RF_CHANGE_BY_SW BIT31
-#define RF_CHANGE_BY_HW BIT30
-#define RF_CHANGE_BY_PS BIT29
-#define RF_CHANGE_BY_IPS BIT28
+#define RF_CHANGE_BY_SW BIT(31)
+#define RF_CHANGE_BY_HW BIT(30)
+#define RF_CHANGE_BY_PS BIT(29)
+#define RF_CHANGE_BY_IPS BIT(28)
 #define RF_CHANGE_BY_INIT      0
 
 enum country_code_type {