From 281da5305b051ea5dd4a8a9dfec5a3b4b7688125 Mon Sep 17 00:00:00 2001 From: John Whitmore Date: Thu, 26 Jul 2018 20:24:21 +0100 Subject: [PATCH] staging:rtl8192u: Remove proxy rtl819XRadioC_Array - Style Remove the array rtl819XRadioC_Array which is only serving as a proxy for the real array Rtl8192UsbRadioC_Array. This is a coding style change and 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 | 1 - 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/staging/rtl8192u/r819xU_phy.c b/drivers/staging/rtl8192u/r819xU_phy.c index 1cbb48c5c110..3ed48d6095d7 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 rtl819XRadioC_Array Rtl8192UsbRadioC_Array #define rtl819XRadioD_Array Rtl8192UsbRadioD_Array /****************************************************************************** @@ -1009,14 +1008,14 @@ u8 rtl8192_phy_ConfigRFWithHeaderFile(struct net_device *dev, case RF90_PATH_C: for (i = 0; i < RadioC_ArrayLength; i = i+2) { - if (rtl819XRadioC_Array[i] == 0xfe) { + if (Rtl8192UsbRadioC_Array[i] == 0xfe) { mdelay(100); continue; } rtl8192_phy_SetRFReg(dev, eRFPath, - rtl819XRadioC_Array[i], + Rtl8192UsbRadioC_Array[i], bMask12Bits, - rtl819XRadioC_Array[i+1]); + Rtl8192UsbRadioC_Array[i+1]); mdelay(1); } diff --git a/drivers/staging/rtl8192u/r819xU_phy.h b/drivers/staging/rtl8192u/r819xU_phy.h index d708796d7cec..44af37f19f45 100644 --- 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 rtl819XRadioC_Array[]; extern u32 rtl819XRadioD_Array[]; enum HW90_BLOCK_E { -- 2.11.0