Skip to contentSkip to conversation

staging: r8188eu: remove unused fields from struct hal_data_8188e

PATCH Superseded Michael Straube 2 participants 7 messages Sep 14, 2021 – Sep 15, 2021 Staging

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover staging: r8188eu: remove unused fields from struct hal_data_8188e

This series removes some unused fields from struct hal_data_8188eu.

Tested on x86_64 with Inter-Tech DMG-02.

Michael Straube (4):
staging: r8188eu: remove unused macros from rtl8188e_hal.h
staging: r8188eu: remove write-only fields from struct hal_data_8188e
staging: r8188eu: remove unused enums from rtl8288e_hal.h
staging: r8188eu: remove unused field from struct hal_data_8188e

 .../staging/r8188eu/hal/rtl8188e_hal_init.c   |  5 -----
 .../staging/r8188eu/include/rtl8188e_hal.h    | 22 -------------------
 2 files changed, 27 deletions(-)
Signature · 1 line
2.33.0
#1 lore raw

PATCH 1/4 staging: r8188eu: remove unused macros from rtl8188e_hal.h

The macros INCLUDE_MULTI_FUNC_BT and INCLUDE_MULTI_FUNC_GPS are not used in the driver, remove them.

---
 drivers/staging/r8188eu/include/rtl8188e_hal.h | 5 -----
 1 file changed, 5 deletions(-)
drivers/staging/r8188eu/include/rtl8188e_hal.h +0 -5
index 537a8d17642c..f16ffd952215 100644
@@ -394,11 +394,6 @@ struct hal_data_8188e {
 	((struct hal_data_8188e *)((__pAdapter)->HalData))
 #define GET_RF_TYPE(priv)		(GET_HAL_DATA(priv)->rf_type)
 
-#define INCLUDE_MULTI_FUNC_BT(_Adapter)				\
-	(GET_HAL_DATA(_Adapter)->MultiFunc & RT_MULTI_FUNC_BT)
-#define INCLUDE_MULTI_FUNC_GPS(_Adapter)			\
-	(GET_HAL_DATA(_Adapter)->MultiFunc & RT_MULTI_FUNC_GPS)
-
 /*  rtl8188e_hal_init.c */
 s32 rtl8188e_FirmwareDownload(struct adapter *padapter);
 void _8051Reset88E(struct adapter *padapter);
Signature · 1 line
2.33.0
#2 lore raw

PATCH 2/4 staging: r8188eu: remove write-only fields from struct hal_data_8188e

In reply to Michael Straube

The fields MultiFunc and RegulatorMode of struct hal_data_8188e are set but never used, remove them.

---
 drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 5 -----
 drivers/staging/r8188eu/include/rtl8188e_hal.h  | 2 --
 2 files changed, 7 deletions(-)
drivers/staging/r8188eu/hal/rtl8188e_hal_init.c +0 -5
index c1188117a5cc..5c6c62e3f6ed 100644
@@ -1684,12 +1684,7 @@ void rtl8188e_read_chip_version(struct adapter *padapter)
 	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) */
-
-	/*  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. */
-	pHalData->MultiFunc = RT_MULTI_FUNC_NONE;
 
 	dump_chip_info(ChipVersion);
 
drivers/staging/r8188eu/include/rtl8188e_hal.h +0 -2
index f16ffd952215..7e2feb390416 100644
@@ -223,8 +223,6 @@ enum rt_regulator_mode {
 
 struct hal_data_8188e {
 	struct HAL_VERSION	VersionID;
-	enum rt_multi_func MultiFunc; /*  For multi-function consideration. */
-	enum rt_regulator_mode RegulatorMode; /*  switching regulator or LDO */
 	u16	CustomerID;
 
 	u16	FirmwareVersion;
Signature · 1 line
2.33.0
#3 lore raw

PATCH 3/4 staging: r8188eu: remove unused enums from rtl8288e_hal.h

In reply to Michael Straube

After removing MultiFunc and RegulatorMode from struct hal_data_8188e the enums rt_multi_func and rt_regulator_mode are unused now, remove them.

---
 drivers/staging/r8188eu/include/rtl8188e_hal.h | 14 --------------
 1 file changed, 14 deletions(-)
drivers/staging/r8188eu/include/rtl8188e_hal.h +0 -14
index 7e2feb390416..17913dcc9fbe 100644
@@ -207,20 +207,6 @@ struct txpowerinfo24g {
 
 #define EFUSE_PROTECT_BYTES_BANK	16
 
-/*  For RTL8723 WiFi/BT/GPS multi-function configuration. */
-enum rt_multi_func {
-	RT_MULTI_FUNC_NONE = 0x00,
-	RT_MULTI_FUNC_WIFI = 0x01,
-	RT_MULTI_FUNC_BT = 0x02,
-	RT_MULTI_FUNC_GPS = 0x04,
-};
-
-/*  For RTL8723 regulator mode. */
-enum rt_regulator_mode {
-	RT_SWITCHING_REGULATOR = 0,
-	RT_LDO_REGULATOR = 1,
-};
-
 struct hal_data_8188e {
 	struct HAL_VERSION	VersionID;
 	u16	CustomerID;
Signature · 1 line
2.33.0
#4 lore raw

PATCH 4/4 staging: r8188eu: remove unused field from struct hal_data_8188e

In reply to Michael Straube

Field BluetoothCoexist of struct hal_data_8188e is unused, remove it.

---
 drivers/staging/r8188eu/include/rtl8188e_hal.h | 1 -
 1 file changed, 1 deletion(-)
drivers/staging/r8188eu/include/rtl8188e_hal.h +0 -1
index 17913dcc9fbe..e7e7064dd356 100644
@@ -289,7 +289,6 @@ struct hal_data_8188e {
 	u8	CrystalCap;
 	u32	AntennaTxPath;			/*  Antenna path Tx */
 	u32	AntennaRxPath;			/*  Antenna path Rx */
-	u8	BluetoothCoexist;
 	u8	ExternalPA;
 
 	u8	bLedOpenDrain; /* Open-drain support for controlling the LED.*/
Signature · 1 line
2.33.0
#5 lore raw
In reply to Michael Straube
Quoted 10 lines · Michael Straube

This series removes some unused fields from struct hal_data_8188eu.

Tested on x86_64 with Inter-Tech DMG-02.

Michael Straube (4):
staging: r8188eu: remove unused macros from rtl8188e_hal.h
staging: r8188eu: remove write-only fields from struct hal_data_8188e
staging: r8188eu: remove unused enums from rtl8288e_hal.h
staging: r8188eu: remove unused field from struct hal_data_8188e

Quoted 7 lines
 .../staging/r8188eu/hal/rtl8188e_hal_init.c   |  5 -----
 .../staging/r8188eu/include/rtl8188e_hal.h    | 22 -------------------
 2 files changed, 27 deletions(-)
Signature · 1 line
2.33.0

Dear Michael,

Looks good, built and tested here and working fine - as you say though these are removals of unused code/properties so I was expecting it to work anyway :-)

One small thing to change though: the subject line of PATCH 3/4 should refer to rtl8188e_hal.h, rather than rtl8288e_hal.h.

Many thanks,
Phil

#6 lore raw
Quoted 19 lines · Phillip Potter
Quoted 10 lines · Michael Straube

This series removes some unused fields from struct hal_data_8188eu.

Tested on x86_64 with Inter-Tech DMG-02.

Michael Straube (4):
staging: r8188eu: remove unused macros from rtl8188e_hal.h
staging: r8188eu: remove write-only fields from struct hal_data_8188e
staging: r8188eu: remove unused enums from rtl8288e_hal.h
staging: r8188eu: remove unused field from struct hal_data_8188e

Quoted 7 lines
  .../staging/r8188eu/hal/rtl8188e_hal_init.c   |  5 -----
  .../staging/r8188eu/include/rtl8188e_hal.h    | 22 -------------------
  2 files changed, 27 deletions(-)
Signature · 1 line
2.33.0
Quoted 8 lines

Dear Michael,

Looks good, built and tested here and working fine - as you say though these are removals of unused code/properties so I was expecting it to work anyway :-)

One small thing to change though: the subject line of PATCH 3/4 should refer to rtl8188e_hal.h, rather than rtl8288e_hal.h.

Thank you for reviewing and spotting the typo Phillip. I'll send v2 soon.

Regards,
Michael