staging: rtl8192e: Join constants PHY_REG_1T2RArray.. with ..LengthPciE

Join constants PHY_REG_1T2RArrayLength with PHY_REG_1T2RArrayLengthPciE to
RTL8192E_PHY_REG_1T2R_ARR_LEN to improve readability.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/0e24d00350bd2c6d17558ea6b6667209e15073d2.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 86d51eb7af17f78a2712c6f830101564cc4f5e3d..231bd49b8892125ab8e2bcc003854eecb0ee87ab 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
@@ -315,7 +315,7 @@ static void _rtl92e_phy_config_bb(struct net_device *dev, u8 ConfigType)
        AGCTAB_ArrayLen = RTL8192E_AGCTAB_ARR_LEN;
        Rtl819XAGCTAB_Array_Table = Rtl819XAGCTAB_Array;
        if (priv->rf_type == RF_1T2R) {
-               PHY_REGArrayLen = PHY_REG_1T2RArrayLength;
+               PHY_REGArrayLen = RTL8192E_PHY_REG_1T2R_ARR_LEN;
                Rtl819XPHY_REGArray_Table = Rtl819XPHY_REG_1T2RArray;
        }
 

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h
index 73a532b967775d80ad429b33de3122f9fded6fe4..96c581475ffe1f84b6e4a044ca67d00cd994f7c7 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h
@@ -9,8 +9,6 @@
 
 #define MAX_DOZE_WAITING_TIMES_9x 64
 
-#define PHY_REG_1T2RArrayLength                        PHY_REG_1T2RArrayLengthPciE
-
 #define Rtl819XMACPHY_Array_PG                 Rtl8192PciEMACPHY_Array_PG
 #define Rtl819XMACPHY_Array                    Rtl8192PciEMACPHY_Array
 #define Rtl819XRadioA_Array                    Rtl8192PciERadioA_Array

diff --git a/drivers/staging/rtl8192e/rtl8192e/table.c b/drivers/staging/rtl8192e/rtl8192e/table.c
index 5c9844f4d1174b7a8d002339e3fad042578b92f3..b2cf4d147c6377e5351036f5e73088bd00e38d73 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/table.c
+++ b/drivers/staging/rtl8192e/rtl8192e/table.c
@@ -6,7 +6,7 @@
  */
 #include "table.h"
 
-u32 Rtl8192PciEPHY_REG_1T2RArray[PHY_REG_1T2RArrayLengthPciE] = {
+u32 Rtl8192PciEPHY_REG_1T2RArray[RTL8192E_PHY_REG_1T2R_ARR_LEN] = {
        0x800, 0x00000000,
        0x804, 0x00000001,
        0x808, 0x0000fc00,

diff --git a/drivers/staging/rtl8192e/rtl8192e/table.h b/drivers/staging/rtl8192e/rtl8192e/table.h
index 70c31d56ea1433da84b6ce2db1197c8b52c7742b..d00aa394c36a5be059ee81ad6c4959f9ab70e86c 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/table.h
+++ b/drivers/staging/rtl8192e/rtl8192e/table.h
@@ -11,8 +11,8 @@
 
 #include <linux/types.h>
 
-#define PHY_REG_1T2RArrayLengthPciE 296
-extern u32 Rtl8192PciEPHY_REG_1T2RArray[PHY_REG_1T2RArrayLengthPciE];
+#define RTL8192E_PHY_REG_1T2R_ARR_LEN 296
+extern u32 Rtl8192PciEPHY_REG_1T2RArray[RTL8192E_PHY_REG_1T2R_ARR_LEN];
 #define RTL8192E_RADIO_A_ARR_LEN 246
 extern u32 Rtl8192PciERadioA_Array[RTL8192E_RADIO_A_ARR_LEN];
 #define RTL8192E_RADIO_B_ARR_LEN 78