staging:rtl8192u: Remove proxy struct rtl819XPHY_REG_1T2RArray - Style

Remove the struct rtl819XPHY_REG_1T2RArray which is simply a proxy for
the struct Rtl8192UsbPHY_REG_1T2RArray. There appears to be no purpose
served by this implementation, other then to obscure the
Rtl8192UsbPHY_REG_1T2RArray structure.

Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192u/r819xU_phy.c b/drivers/staging/rtl8192u/r819xU_phy.c
index cc35ca7b914026be90809122545873c9fa67ec0b..8d44bbe90221d8393136faf3506662be74e691b4 100644 (file)
--- a/drivers/staging/rtl8192u/r819xU_phy.c
+++ b/drivers/staging/rtl8192u/r819xU_phy.c
@@ -28,8 +28,6 @@ static u32 RF_CHANNEL_TABLE_ZEBRA[] = {
        0x0f72, /* 2484    */
 };
 
-
-#define rtl819XPHY_REG_1T2RArray Rtl8192UsbPHY_REG_1T2RArray
 #define rtl819XMACPHY_Array Rtl8192UsbMACPHY_Array
 #define rtl819XRadioA_Array  Rtl8192UsbRadioA_Array
 #define rtl819XRadioB_Array Rtl8192UsbRadioB_Array
@@ -534,13 +532,13 @@ void rtl8192_phyConfigBB(struct net_device *dev, u8 ConfigType)
 #endif
        if (ConfigType == BaseBand_Config_PHY_REG) {
                for (i = 0; i < PHY_REG_1T2RArrayLength; i += 2) {
-                       rtl8192_setBBreg(dev, rtl819XPHY_REG_1T2RArray[i],
+                       rtl8192_setBBreg(dev, Rtl8192UsbPHY_REG_1T2RArray[i],
                                         bMaskDWord,
-                                        rtl819XPHY_REG_1T2RArray[i+1]);
+                                        Rtl8192UsbPHY_REG_1T2RArray[i+1]);
                        RT_TRACE(COMP_DBG,
                                 "i: %x, Rtl819xUsbPHY_REGArray[0]=%x Rtl819xUsbPHY_REGArray[1]=%x\n",
-                                i, rtl819XPHY_REG_1T2RArray[i],
-                                rtl819XPHY_REG_1T2RArray[i+1]);
+                                i, Rtl8192UsbPHY_REG_1T2RArray[i],
+                                Rtl8192UsbPHY_REG_1T2RArray[i+1]);
                }
        } else if (ConfigType == BaseBand_Config_AGC_TAB) {
                for (i = 0; i < AGCTAB_ArrayLength; i += 2) {

diff --git a/drivers/staging/rtl8192u/r819xU_phy.h b/drivers/staging/rtl8192u/r819xU_phy.h
index 3c069b89bcdb62bb1279eac1183309db13f23251..842837bd6631998b87e30fd257a5f17ae31c228f 100644 (file)
--- a/drivers/staging/rtl8192u/r819xU_phy.h
+++ b/drivers/staging/rtl8192u/r819xU_phy.h
@@ -25,7 +25,6 @@ struct sw_chnl_cmd {
        u32                     ms_delay;
 } __packed;
 
-extern u32 rtl819XPHY_REG_1T2RArray[];
 extern u32 rtl819XAGCTAB_Array[];
 extern u32 rtl819XRadioA_Array[];
 extern u32 rtl819XRadioB_Array[];