From a99d02401f2493fb0ddaa34b94e30e9437d2726f Mon Sep 17 00:00:00 2001 From: John Whitmore Date: Thu, 26 Jul 2018 20:24:22 +0100 Subject: [PATCH] staging:rtl8192u: Remove proxy rtl819XRadioD_Array - Style Remove the array rtl819XRadioD_Array which is only acting as a proxy to the real array Rtl8192UsbRadioD_Array. This is a coding style change which should have no impact on runtime code execution. Signed-off-by: John Whitmore Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8192u/r819xU_phy.c | 7 +++---- drivers/staging/rtl8192u/r819xU_phy.h | 2 -- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/staging/rtl8192u/r819xU_phy.c b/drivers/staging/rtl8192u/r819xU_phy.c index 3ed48d6..983520b 100644 --- a/drivers/staging/rtl8192u/r819xU_phy.c +++ b/drivers/staging/rtl8192u/r819xU_phy.c @@ -29,7 +29,6 @@ static u32 RF_CHANNEL_TABLE_ZEBRA[] = { }; #define rtl819XMACPHY_Array Rtl8192UsbMACPHY_Array -#define rtl819XRadioD_Array Rtl8192UsbRadioD_Array /****************************************************************************** * function: This function checks different RF type to execute legal judgement. @@ -1023,14 +1022,14 @@ u8 rtl8192_phy_ConfigRFWithHeaderFile(struct net_device *dev, case RF90_PATH_D: for (i = 0; i < RadioD_ArrayLength; i = i+2) { - if (rtl819XRadioD_Array[i] == 0xfe) { + if (Rtl8192UsbRadioD_Array[i] == 0xfe) { mdelay(100); continue; } rtl8192_phy_SetRFReg(dev, eRFPath, - rtl819XRadioD_Array[i], + Rtl8192UsbRadioD_Array[i], bMask12Bits, - rtl819XRadioD_Array[i+1]); + Rtl8192UsbRadioD_Array[i+1]); mdelay(1); } diff --git a/drivers/staging/rtl8192u/r819xU_phy.h b/drivers/staging/rtl8192u/r819xU_phy.h index 44af37f..2cd1c25 100644 --- a/drivers/staging/rtl8192u/r819xU_phy.h +++ b/drivers/staging/rtl8192u/r819xU_phy.h @@ -25,8 +25,6 @@ struct sw_chnl_cmd { u32 ms_delay; } __packed; -extern u32 rtl819XRadioD_Array[]; - enum HW90_BLOCK_E { HW90_BLOCK_MAC = 0, HW90_BLOCK_PHY0 = 1, -- 2.7.4