From def6b79f3f2d0439822a2eab5ddfe8696e999ad4 Mon Sep 17 00:00:00 2001 From: John Whitmore Date: Thu, 26 Jul 2018 20:24:18 +0100 Subject: [PATCH] staging:rtl8192u: Remove proxy array rtl819XAGCTAB_Array - Style Remove the array rtl819XAGCTAB_Array which is only a proxy to the array Rtl8192UsbAGCTAB_Array. There appears to be no purpose served by this implementation, other then to obscure the Rtl8192UsbAGCTAB_Array structure, which is actually written to and read from. Signed-off-by: John Whitmore Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8192u/r819xU_phy.c | 11 +++++------ drivers/staging/rtl8192u/r819xU_phy.h | 1 - 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/staging/rtl8192u/r819xU_phy.c b/drivers/staging/rtl8192u/r819xU_phy.c index 8d44bbe90221..cf7b09f9818a 100644 --- a/drivers/staging/rtl8192u/r819xU_phy.c +++ b/drivers/staging/rtl8192u/r819xU_phy.c @@ -33,7 +33,6 @@ static u32 RF_CHANNEL_TABLE_ZEBRA[] = { #define rtl819XRadioB_Array Rtl8192UsbRadioB_Array #define rtl819XRadioC_Array Rtl8192UsbRadioC_Array #define rtl819XRadioD_Array Rtl8192UsbRadioD_Array -#define rtl819XAGCTAB_Array Rtl8192UsbAGCTAB_Array /****************************************************************************** * function: This function checks different RF type to execute legal judgement. @@ -542,12 +541,12 @@ void rtl8192_phyConfigBB(struct net_device *dev, u8 ConfigType) } } else if (ConfigType == BaseBand_Config_AGC_TAB) { for (i = 0; i < AGCTAB_ArrayLength; i += 2) { - rtl8192_setBBreg(dev, rtl819XAGCTAB_Array[i], - bMaskDWord, rtl819XAGCTAB_Array[i+1]); + rtl8192_setBBreg(dev, Rtl8192UsbAGCTAB_Array[i], + bMaskDWord, Rtl8192UsbAGCTAB_Array[i+1]); RT_TRACE(COMP_DBG, - "i: %x, rtl819XAGCTAB_Array[0]=%x rtl819XAGCTAB_Array[1]=%x\n", - i, rtl819XAGCTAB_Array[i], - rtl819XAGCTAB_Array[i+1]); + "i: %x, Rtl8192UsbAGCTAB_Array[0]=%x Rtl8192UsbAGCTAB_Array[1]=%x\n", + i, Rtl8192UsbAGCTAB_Array[i], + Rtl8192UsbAGCTAB_Array[i+1]); } } } diff --git a/drivers/staging/rtl8192u/r819xU_phy.h b/drivers/staging/rtl8192u/r819xU_phy.h index 842837bd6631..808a11c475a4 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 rtl819XAGCTAB_Array[]; extern u32 rtl819XRadioA_Array[]; extern u32 rtl819XRadioB_Array[]; extern u32 rtl819XRadioC_Array[]; -- 2.11.0