staging: rtl8188eu: Clean up rtl8188e_read_chip_version()
cover staging: rtl8188eu: Clean up rtl8188e_read_chip_version()
This series of clean-up patches is a result of a review of rtl8188e_read_chip_version().
The motivation for getting it in shape is that this function could serve as read_chip_version function callback in struct rtl_hal_ops, if this driver gets converted to use rtl_usb (rtlwifi).
Jakub Sitnicki (5):
staging: rtl8188eu: remove RegulatorMode from struct hal_data_8188e
staging: rtl8188eu: remove ICtype from struct HAL_VERSION
staging: rtl8188eu: remove RFtype from struct HAL_VERSION
staging: rtl8188eu: remove ROMVer from struct HAL_VERSION
staging: rtl8188eu: fold rtl8188e_read_chip_version() into
rtl8188e_SetHalODMVar()
drivers/staging/rtl8188eu/hal/hal_com.c | 27 +------- drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 32 ++------- drivers/staging/rtl8188eu/hal/usb_halinit.c | 2 +- drivers/staging/rtl8188eu/include/HalVerDef.h | 84 ----------------------- drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 7 -- 5 files changed, 8 insertions(+), 144 deletions(-)
Signature · 1 line
2.1.0
PATCH 1/5 staging: rtl8188eu: remove RegulatorMode from struct hal_data_8188e
This field is not used anywhere. Also, kill the rt_regulator_mode enum which exists just for this field.
--- drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 3 --- drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 7 ------- 2 files changed, 10 deletions(-)
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c +0 -3
@@ -144,9 +144,6 @@ static struct HAL_VERSION ReadChipVersion8188E(struct adapter *padapter) ChipVersion.VendorType = ((value32 &VENDOR_ID ) ?CHIP_VENDOR_UMC :CHIP_VENDOR_TSMC ); ChipVersion.CUTVersion = (value32 &CHIP_VER_RTL_MASK )>>CHIP_VER_RTL_SHIFT ;/* IC version (CUT) */ -/* For regulator mode. by tynli. 2011.01.14 */ - pHalData->RegulatorMode = ((value32 &TRP_BT_EN ) ?RT_LDO_REGULATOR :RT_SWITCHING_REGULATOR ); - ChipVersion.ROMVer =0 ;/* ROM code version. */ dump_chip_info (ChipVersion);
drivers/staging/rtl8188eu/include/rtl8188e_hal.h +0 -7
@@ -188,15 +188,8 @@ struct txpowerinfo24g {#define EFUSE_PROTECT_BYTES_BANK 16 -/* For RTL8723 regulator mode. */ -enum rt_regulator_mode { -RT_SWITCHING_REGULATOR =0 , -RT_LDO_REGULATOR =1 , -}; -struct hal_data_8188e {struct HAL_VERSION VersionID; -enum rt_regulator_mode RegulatorMode;/* switching regulator or LDO */ u16 CustomerID;u8 *pfirmware;u32 fwsize;
Signature · 1 line
2.1.0
PATCH 2/5 staging: rtl8188eu: remove ICtype from struct HAL_VERSION
In reply to Jakub SitnickiIC type on RTL8188EU is always 8188E. Remove it and all the macros that check it.
--- drivers/staging/rtl8188eu/hal/hal_com.c | 13 +---- drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 1 - drivers/staging/rtl8188eu/hal/usb_halinit.c | 2 +- drivers/staging/rtl8188eu/include/HalVerDef.h | 61 ----------------------- 4 files changed, 2 insertions(+), 75 deletions(-)
drivers/staging/rtl8188eu/hal/hal_com.c +1 -12
@@ -31,18 +31,7 @@ void dump_chip_info(struct HAL_VERSION chip_vers)uint cnt =0 ;char buf[128 ]; -if (IS_81XXC (chip_vers)) { - cnt +=sprintf ((buf+cnt),"Chip Version Info: %s_" , -IS_92C_SERIAL (chip_vers) ? -"CHIP_8192C" :"CHIP_8188C" ); - }else if (IS_92D (chip_vers)) { - cnt +=sprintf ((buf+cnt),"Chip Version Info: CHIP_8192D_" ); - }else if (IS_8723_SERIES (chip_vers)) { - cnt +=sprintf ((buf+cnt),"Chip Version Info: CHIP_8723A_" ); - }else if (IS_8188E (chip_vers)) { - cnt +=sprintf ((buf+cnt),"Chip Version Info: CHIP_8188E_" ); - } - + cnt +=sprintf ((buf+cnt),"Chip Version Info: CHIP_8188E_" ); cnt +=sprintf ((buf+cnt),"%s_" ,IS_NORMAL_CHIP (chip_vers) ?"Normal_Chip" :"Test_Chip" ); cnt += sprintf((buf+cnt), "%s_", IS_CHIP_VENDOR_TSMC(chip_vers) ?
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c +0 -1
@@ -137,7 +137,6 @@ static struct HAL_VERSION ReadChipVersion8188E(struct adapter *padapter) pHalData =GET_HAL_DATA (padapter); value32 =usb_read32 (padapter,REG_SYS_CFG ); - ChipVersion.ICType =CHIP_8188E ; ChipVersion.ChipType = ((value32 &RTL_ID ) ?TEST_CHIP :NORMAL_CHIP ); ChipVersion.RFType =RF_TYPE_1T1R ;
drivers/staging/rtl8188eu/hal/usb_halinit.c +1 -1
@@ -1703,7 +1703,7 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)/* Forece leave RF low power mode for 1T1R to prevent conficting setting in Fw power */ /* saving sequence. 2010.06.07. Added by tynli. Suggested by SD3 yschang. */ -if ((psmode !=PS_MODE_ACTIVE ) && (!IS_92C_SERIAL (haldata->VersionID))) +if (psmode !=PS_MODE_ACTIVE )ODM_RF_Saving (podmpriv, true);rtl8188e_set_FwPwrMode_cmd (Adapter, psmode); }
drivers/staging/rtl8188eu/include/HalVerDef.h +0 -61
89 lines not on this page · raw message
Signature · 1 line
2.1.0
PATCH 3/5 staging: rtl8188eu: remove RFtype from struct HAL_VERSION
In reply to Jakub SitnickiRFtype in struct HAL_VERSION duplicates rf_type in struct hal_data_8188e, and does not change. Remove it and the macros that test it.
--- drivers/staging/rtl8188eu/hal/hal_com.c | 12 +----------- drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 15 ++------------- drivers/staging/rtl8188eu/include/HalVerDef.h | 21 --------------------- 3 files changed, 3 insertions(+), 45 deletions(-)
drivers/staging/rtl8188eu/hal/hal_com.c +1 -11
@@ -49,17 +49,7 @@ void dump_chip_info(struct HAL_VERSION chip_vers)else cnt +=sprintf ((buf+cnt),"UNKNOWN_CUT(%d)_" , chip_vers.CUTVersion); - -if (IS_1T1R (chip_vers)) - cnt +=sprintf ((buf+cnt),"1T1R_" ); -else if (IS_1T2R (chip_vers)) - cnt +=sprintf ((buf+cnt),"1T2R_" ); -else if (IS_2T2R (chip_vers)) - cnt +=sprintf ((buf+cnt),"2T2R_" ); -else - cnt +=sprintf ((buf+cnt),"UNKNOWN_RFTYPE(%d)_" , - chip_vers.RFType); - + cnt +=sprintf ((buf+cnt),"1T1R_" ); cnt +=sprintf ((buf+cnt),"RomVer(%d)\n" , chip_vers.ROMVer);pr_info ("%s" , buf);
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c +2 -13
@@ -138,8 +138,6 @@ static struct HAL_VERSION ReadChipVersion8188E(struct adapter *padapter) value32 =usb_read32 (padapter,REG_SYS_CFG ); ChipVersion.ChipType = ((value32 &RTL_ID ) ?TEST_CHIP :NORMAL_CHIP ); - - ChipVersion.RFType =RF_TYPE_1T1R ; ChipVersion.VendorType = ((value32 &VENDOR_ID ) ?CHIP_VENDOR_UMC :CHIP_VENDOR_TSMC ); ChipVersion.CUTVersion = (value32 &CHIP_VER_RTL_MASK )>>CHIP_VER_RTL_SHIFT ;/* IC version (CUT) */
@@ -148,17 +146,8 @@ static struct HAL_VERSION ReadChipVersion8188E(struct adapter *padapter)dump_chip_info (ChipVersion); pHalData->VersionID = ChipVersion; - -if (IS_1T2R (ChipVersion)) { - pHalData->rf_type =RF_1T2R ; - pHalData->NumTotalRFPath =2 ; - }else if (IS_2T2R (ChipVersion)) { - pHalData->rf_type =RF_2T2R ; - pHalData->NumTotalRFPath =2 ; - }else { - pHalData->rf_type =RF_1T1R ; - pHalData->NumTotalRFPath =1 ; - } + pHalData->rf_type =RF_1T1R ; + pHalData->NumTotalRFPath =1 ;MSG_88E ("RF_Type is %x!!\n" , pHalData->rf_type);
drivers/staging/rtl8188eu/include/HalVerDef.h +0 -21
@@ -41,28 +41,15 @@ enum HAL_VENDOR { CHIP_VENDOR_UMC = 1, }; -enum HAL_RF_TYPE { -RF_TYPE_1T1R =0 , -RF_TYPE_1T2R =1 , -RF_TYPE_2T2R =2 , -RF_TYPE_2T3R =3 , -RF_TYPE_2T4R =4 , -RF_TYPE_3T3R =5 , -RF_TYPE_3T4R =6 , -RF_TYPE_4T4R =7 , -}; -struct HAL_VERSION {enum HAL_CHIP_TYPE ChipType;enum HAL_CUT_VERSION CUTVersion;enum HAL_VENDOR VendorType; -enum HAL_RF_TYPE RFType;u8 ROMVer; };/* Get element */ #define GET_CVID_CHIP_TYPE (version) (((version).ChipType)) -#define GET_CVID_RF_TYPE (version) (((version).RFType))#define GET_CVID_MANUFACTUER (version) (((version).VendorType))#define GET_CVID_CUT_VERSION (version) (((version).CUTVersion))#define GET_CVID_ROM_VERSION (version) (((version).ROMVer) & ROM_VERSION_MASK)
@@ -95,12 +82,4 @@ struct HAL_VERSION {#define IS_CHIP_VENDOR_UMC (version) \ ((GET_CVID_MANUFACTUER(version) == CHIP_VENDOR_UMC) ? true : false) -/* HAL_RF_TYPE_E */ -#define IS_1T1R (version) \ - ((GET_CVID_RF_TYPE(version) == RF_TYPE_1T1R) ? true : false) -#define IS_1T2R (version) \ - ((GET_CVID_RF_TYPE(version) == RF_TYPE_1T2R) ? true : false) -#define IS_2T2R (version) \ - ((GET_CVID_RF_TYPE(version) == RF_TYPE_2T2R) ? true : false) -#endif
Signature · 1 line
2.1.0
PATCH 4/5 staging: rtl8188eu: remove ROMVer from struct HAL_VERSION
In reply to Jakub SitnickiROM version on RTL8188EU is always 0.
--- drivers/staging/rtl8188eu/hal/hal_com.c | 2 +- drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 2 -- drivers/staging/rtl8188eu/include/HalVerDef.h | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-)
drivers/staging/rtl8188eu/hal/hal_com.c +1 -1
@@ -50,7 +50,7 @@ void dump_chip_info(struct HAL_VERSION chip_vers) cnt +=sprintf ((buf+cnt),"UNKNOWN_CUT(%d)_" , chip_vers.CUTVersion); cnt +=sprintf ((buf+cnt),"1T1R_" ); - cnt +=sprintf ((buf+cnt),"RomVer(%d)\n" , chip_vers.ROMVer); + cnt +=sprintf ((buf+cnt),"RomVer(0)\n" );pr_info ("%s" , buf); }
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c +0 -2
@@ -141,8 +141,6 @@ static struct HAL_VERSION ReadChipVersion8188E(struct adapter *padapter) ChipVersion.VendorType = ((value32 &VENDOR_ID ) ?CHIP_VENDOR_UMC :CHIP_VENDOR_TSMC ); ChipVersion.CUTVersion = (value32 &CHIP_VER_RTL_MASK )>>CHIP_VER_RTL_SHIFT ;/* IC version (CUT) */ - ChipVersion.ROMVer =0 ;/* ROM code version. */ -dump_chip_info (ChipVersion); pHalData->VersionID = ChipVersion;
drivers/staging/rtl8188eu/include/HalVerDef.h +0 -2
@@ -45,14 +45,12 @@ struct HAL_VERSION {enum HAL_CHIP_TYPE ChipType;enum HAL_CUT_VERSION CUTVersion;enum HAL_VENDOR VendorType; -u8 ROMVer; };/* Get element */ #define GET_CVID_CHIP_TYPE (version) (((version).ChipType))#define GET_CVID_MANUFACTUER (version) (((version).VendorType))#define GET_CVID_CUT_VERSION (version) (((version).CUTVersion)) -#define GET_CVID_ROM_VERSION (version) (((version).ROMVer) & ROM_VERSION_MASK)/* Common Macro. -- */ /* HAL_VERSION VersionID */
Signature · 1 line
2.1.0
PATCH 5/5 staging: rtl8188eu: fold rtl8188e_read_chip_version() into rtl8188e_SetHalODMVar()
In reply to Jakub SitnickiBoth rtl8188e_read_chip_version() and ReadChipVersion8188E() are used only in one place. Make ReadChipVersion8188E() a void function and eliminate its wrapper - rtl8188e_read_chip_version().
--- drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c +2 -9
@@ -128,7 +128,7 @@ static void rtl8188e_free_hal_data(struct adapter *padapter) padapter->HalData =NULL ; } -static struct HAL_VERSION ReadChipVersion8188E (struct adapter *padapter) +static void ReadChipVersion8188E (struct adapter *padapter) {u32 value32;struct HAL_VERSION ChipVersion;
@@ -148,13 +148,6 @@ static struct HAL_VERSION ReadChipVersion8188E(struct adapter *padapter) pHalData->NumTotalRFPath =1 ;MSG_88E ("RF_Type is %x!!\n" , pHalData->rf_type); - -return ChipVersion; -} - -static void rtl8188e_read_chip_version (struct adapter *padapter) -{ -ReadChipVersion8188E (padapter); }static void rtl8188e_SetHalODMVar (struct adapter *Adapter,enum hal_odm_variable eVariable,void *pValue1,bool bSet)
@@ -203,7 +196,7 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc) pHalFunc->dm_init = &rtl8188e_init_dm_priv; - pHalFunc->read_chip_version = &rtl8188e_read_chip_version; + pHalFunc->read_chip_version = &ReadChipVersion8188E; pHalFunc->set_bwmode_handler = &phy_set_bw_mode; pHalFunc->set_channel_handler = &phy_sw_chnl;
Signature · 1 line
2.1.0