staging: r8188eu: replace the READ_AND_CONFIG

The READ_AND_CONFIG macro builds a function name from chip type and
table name.

Remove the macro and use the resulting function names directly. This
makes the code easier to read.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20220110124638.6909-6-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/hal/odm_HWConfig.c b/drivers/staging/r8188eu/hal/odm_HWConfig.c
index ef35e3c317945e4c4978c4d47ff57c8569a218c5..2f0752418fe27122ba50b646eaa7a8e4ea1a6183 100644 (file)
--- a/drivers/staging/r8188eu/hal/odm_HWConfig.c
+++ b/drivers/staging/r8188eu/hal/odm_HWConfig.c
@@ -3,10 +3,6 @@
 
 #include "../include/drv_types.h"
 
-#define READ_AND_CONFIG     READ_AND_CONFIG_MP
-
-#define READ_AND_CONFIG_MP(ic, txt) (ODM_ReadAndConfig##txt##ic(dm_odm))
-
 static u8 odm_QueryRxPwrPercentage(s8 AntPower)
 {
        if ((AntPower <= -100) || (AntPower >= 20))
@@ -364,7 +360,7 @@ void ODM_PhyStatusQuery(struct odm_dm_struct *dm_odm,
 
 enum HAL_STATUS ODM_ConfigRFWithHeaderFile(struct odm_dm_struct *dm_odm)
 {
-       READ_AND_CONFIG(8188E, _RadioA_1T_);
+       ODM_ReadAndConfig_RadioA_1T_8188E(dm_odm);
 
        return HAL_STATUS_SUCCESS;
 }
@@ -372,20 +368,17 @@ enum HAL_STATUS ODM_ConfigRFWithHeaderFile(struct odm_dm_struct *dm_odm)
 enum HAL_STATUS ODM_ConfigBBWithHeaderFile(struct odm_dm_struct *dm_odm,
                                           enum odm_bb_config_type config_tp)
 {
-       if (config_tp == CONFIG_BB_PHY_REG) {
-               READ_AND_CONFIG(8188E, _PHY_REG_1T_);
-       } else if (config_tp == CONFIG_BB_AGC_TAB) {
-               READ_AND_CONFIG(8188E, _AGC_TAB_1T_);
-       } else if (config_tp == CONFIG_BB_PHY_REG_PG) {
-               READ_AND_CONFIG(8188E, _PHY_REG_PG_);
-       }
+       if (config_tp == CONFIG_BB_PHY_REG)
+               ODM_ReadAndConfig_PHY_REG_1T_8188E(dm_odm);
+       else if (config_tp == CONFIG_BB_AGC_TAB)
+               ODM_ReadAndConfig_AGC_TAB_1T_8188E(dm_odm);
+       else if (config_tp == CONFIG_BB_PHY_REG_PG)
+               ODM_ReadAndConfig_PHY_REG_PG_8188E(dm_odm);
 
        return HAL_STATUS_SUCCESS;
 }
 
 enum HAL_STATUS ODM_ConfigMACWithHeaderFile(struct odm_dm_struct *dm_odm)
 {
-       u8 result = HAL_STATUS_SUCCESS;
-       result = READ_AND_CONFIG(8188E, _MAC_REG_);
-       return result;
+       return ODM_ReadAndConfig_MAC_REG_8188E(dm_odm);
 }