staging: r8188eu: remove duplicate defines

The following constants are defined in three different header files.

IQK_MAC_REG_NUM
IQK_ADDA_REG_NUM
IQK_BB_REG_NUM
HP_THERMAL_NUM

Keep them in odm.h and remove them from Hal8188EPhyCfg.h and
rtl8188e_dm.h.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20211205171342.20551-8-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/include/Hal8188EPhyCfg.h b/drivers/staging/r8188eu/include/Hal8188EPhyCfg.h
index f4cfd11b36c1a3dc234b3d9e7b01a3ea94a8a7ed..addc6a5354a608eb9f8cdbbf2e6bfe80026b5064 100644 (file)
--- a/drivers/staging/r8188eu/include/Hal8188EPhyCfg.h
+++ b/drivers/staging/r8188eu/include/Hal8188EPhyCfg.h
@@ -11,11 +11,6 @@
 #define MAX_TXPWR_IDX_NMODE_92S                63
 #define Reset_Cnt_Limit                        3
 
-#define IQK_MAC_REG_NUM                        4
-#define IQK_ADDA_REG_NUM               16
-#define IQK_BB_REG_NUM                 9
-#define HP_THERMAL_NUM                 8
-
 #define MAX_AGGR_NUM                   0x07
 
 /*--------------------------Define Parameters-------------------------------*/

diff --git a/drivers/staging/r8188eu/include/rtl8188e_dm.h b/drivers/staging/r8188eu/include/rtl8188e_dm.h
index 208bea050f6f840d1ed1c04778efbd59a8d13a79..0b3a9a1a4e5cc668f28709f78278e5d3849b1e1e 100644 (file)
--- a/drivers/staging/r8188eu/include/rtl8188e_dm.h
+++ b/drivers/staging/r8188eu/include/rtl8188e_dm.h
@@ -8,12 +8,7 @@ enum{
        UP_LINK,
        DOWN_LINK,
 };
-/*  duplicate code,will move to ODM ######### */
-#define IQK_MAC_REG_NUM                4
-#define IQK_ADDA_REG_NUM               16
-#define IQK_BB_REG_NUM                 9
-#define HP_THERMAL_NUM         8
-/*  duplicate code,will move to ODM ######### */
+
 struct dm_priv {
        u32     InitODMFlag;