From 416599d096ae05b164b5112b064df91fdd9dd980 Mon Sep 17 00:00:00 2001 From: John Whitmore Date: Thu, 26 Jul 2018 20:24:20 +0100 Subject: [PATCH] staging:rtl8192u: Remove proxy rtl819XRadioB_Array - Style Remove the array rtl819XRadioB_Array Rtl8192UsbRadioB_Array which acts as a proxy the actual array Rtl8192UsbRadioB_Array. The only purpose, I can see for this implementation is to obscure the actual array being used Rtl8192UsbRadioB_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 | 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 775dfa847b93..1cbb48c5c110 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 rtl819XRadioB_Array Rtl8192UsbRadioB_Array #define rtl819XRadioC_Array Rtl8192UsbRadioC_Array #define rtl819XRadioD_Array Rtl8192UsbRadioD_Array @@ -995,14 +994,14 @@ u8 rtl8192_phy_ConfigRFWithHeaderFile(struct net_device *dev, case RF90_PATH_B: for (i = 0; i < RadioB_ArrayLength; i = i+2) { - if (rtl819XRadioB_Array[i] == 0xfe) { + if (Rtl8192UsbRadioB_Array[i] == 0xfe) { mdelay(100); continue; } rtl8192_phy_SetRFReg(dev, eRFPath, - rtl819XRadioB_Array[i], + Rtl8192UsbRadioB_Array[i], bMask12Bits, - rtl819XRadioB_Array[i+1]); + Rtl8192UsbRadioB_Array[i+1]); mdelay(1); } diff --git a/drivers/staging/rtl8192u/r819xU_phy.h b/drivers/staging/rtl8192u/r819xU_phy.h index 7c4b89a5c592..d708796d7cec 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 rtl819XRadioB_Array[]; extern u32 rtl819XRadioC_Array[]; extern u32 rtl819XRadioD_Array[]; -- 2.11.0