staging: rtl8188eu: rarely used macros replaced by their definitions

IS_* macros (except one) occur only once.

Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/hal/hal_com.c b/drivers/staging/rtl8188eu/hal/hal_com.c
index 38e9fdc..3871cda 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/hal_com.c
+++ b/drivers/staging/rtl8188eu/hal/hal_com.c
@@ -32,19 +32,19 @@ void dump_chip_info(struct HAL_VERSION      chip_vers)
        char buf[128];
 
        cnt += sprintf((buf+cnt), "Chip Version Info: CHIP_8188E_");
-       cnt += sprintf((buf+cnt), "%s_", IS_NORMAL_CHIP(chip_vers) ?
+       cnt += sprintf((buf+cnt), "%s_", chip_vers.ChipType == NORMAL_CHIP ?
                       "Normal_Chip" : "Test_Chip");
-       cnt += sprintf((buf+cnt), "%s_", IS_CHIP_VENDOR_TSMC(chip_vers) ?
+       cnt += sprintf((buf+cnt), "%s_", chip_vers.VendorType == CHIP_VENDOR_TSMC ?
                       "TSMC" : "UMC");
-       if (IS_A_CUT(chip_vers))
+       if (chip_vers.CUTVersion == A_CUT_VERSION)
                cnt += sprintf((buf+cnt), "A_CUT_");
-       else if (IS_B_CUT(chip_vers))
+       else if (chip_vers.CUTVersion == B_CUT_VERSION)
                cnt += sprintf((buf+cnt), "B_CUT_");
-       else if (IS_C_CUT(chip_vers))
+       else if (chip_vers.CUTVersion == C_CUT_VERSION)
                cnt += sprintf((buf+cnt), "C_CUT_");
-       else if (IS_D_CUT(chip_vers))
+       else if (chip_vers.CUTVersion == D_CUT_VERSION)
                cnt += sprintf((buf+cnt), "D_CUT_");
-       else if (IS_E_CUT(chip_vers))
+       else if (chip_vers.CUTVersion == E_CUT_VERSION)
                cnt += sprintf((buf+cnt), "E_CUT_");
        else
                cnt += sprintf((buf+cnt), "UNKNOWN_CUT(%d)_",

diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c b/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
index fca5909..199a77a 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
@@ -67,7 +67,7 @@ static void Init_ODM_ComInfo_88E(struct adapter *Adapter)
        ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_FAB_VER, fab_ver);
        ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_CUT_VER, cut_ver);
 
-       ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_MP_TEST_CHIP, IS_NORMAL_CHIP(hal_data->VersionID));
+       ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_MP_TEST_CHIP, hal_data->VersionID.ChipType == NORMAL_CHIP ? true : false);
 
        ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_PATCH_ID, hal_data->CustomerID);
        ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_BWIFI_TEST, Adapter->registrypriv.wifi_spec);