staging: rtl8192e: Join constants RadioA_ArrayLength with ..LengthPciE

Join constants RadioA_ArrayLength with RadioA_ArrayLengthPciE to
RTL8192E_RADIO_A_ARR_LEN to improve readability.

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

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
index 29918a529f77fdda4f609847323e56173b83e74c..e4d1b7ad64ac56f53657bdec46432f7137818319 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
@@ -542,7 +542,7 @@ u8 rtl92e_config_rf_path(struct net_device *dev, enum rf90_radio_path eRFPath)
 
        switch (eRFPath) {
        case RF90_PATH_A:
-               for (i = 0; i < RadioA_ArrayLength; i += 2) {
+               for (i = 0; i < RTL8192E_RADIO_A_ARR_LEN; i += 2) {
                        if (Rtl819XRadioA_Array[i] == 0xfe) {
                                msleep(100);
                                continue;

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h
index 611756517ce64d99d4e99b20223db127f35f567d..8f9200bed456234a60f04f4f682ba93e4c2bb0f7 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h
@@ -9,7 +9,6 @@
 
 #define MAX_DOZE_WAITING_TIMES_9x 64
 
-#define RadioA_ArrayLength                     RadioA_ArrayLengthPciE
 #define RadioB_ArrayLength                     RadioB_ArrayLengthPciE
 #define MACPHY_Array_PGLength                  MACPHY_Array_PGLengthPciE
 #define PHY_REG_1T2RArrayLength                        PHY_REG_1T2RArrayLengthPciE

diff --git a/drivers/staging/rtl8192e/rtl8192e/table.c b/drivers/staging/rtl8192e/rtl8192e/table.c
index be6c4b7c0e0e0ebe60340866a5ed71cd98d62d5b..5820c47f4e14691b2c074f3ed39a98cb09d31af3 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/table.c
+++ b/drivers/staging/rtl8192e/rtl8192e/table.c
@@ -157,7 +157,7 @@ u32 Rtl8192PciEPHY_REG_1T2RArray[PHY_REG_1T2RArrayLengthPciE] = {
        0xe1c, 0x12121416,
 };
 
-u32 Rtl8192PciERadioA_Array[RadioA_ArrayLengthPciE] = {
+u32 Rtl8192PciERadioA_Array[RTL8192E_RADIO_A_ARR_LEN] = {
        0x019, 0x00000003,
        0x000, 0x000000bf,
        0x001, 0x00000ee0,

diff --git a/drivers/staging/rtl8192e/rtl8192e/table.h b/drivers/staging/rtl8192e/rtl8192e/table.h
index cb424c8fbee0633a728b8062f6b2ddf197b2aab8..d177b7b17b199e88cdd820f5a9c6c5310fee8d7f 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/table.h
+++ b/drivers/staging/rtl8192e/rtl8192e/table.h
@@ -13,8 +13,8 @@
 
 #define PHY_REG_1T2RArrayLengthPciE 296
 extern u32 Rtl8192PciEPHY_REG_1T2RArray[PHY_REG_1T2RArrayLengthPciE];
-#define RadioA_ArrayLengthPciE 246
-extern u32 Rtl8192PciERadioA_Array[RadioA_ArrayLengthPciE];
+#define RTL8192E_RADIO_A_ARR_LEN 246
+extern u32 Rtl8192PciERadioA_Array[RTL8192E_RADIO_A_ARR_LEN];
 #define RadioB_ArrayLengthPciE 78
 extern u32 Rtl8192PciERadioB_Array[RadioB_ArrayLengthPciE];
 #define RTL8192E_MACPHY_ARR_LEN 18