From: Nikolay Kulikov Date: Sat, 2 May 2026 21:55:48 +0000 (+0300) Subject: staging: rtl8723bs: remove struct hal_version from include/HalVerDef.h X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=2e0ebca1c0103d2f8f54771e3caaa3caf9487dbd;p=thirdparty%2Flinux.git staging: rtl8723bs: remove struct hal_version from include/HalVerDef.h Remove the empty 'struct hal_version' as all its fields were removed earlier and it is no longer needed. Signed-off-by: Nikolay Kulikov Link: https://patch.msgid.link/20260502220056.59815-10-nikolayof23@gmail.com Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c index 5c3b92f473aa1..ebcd174336dc2 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c @@ -825,10 +825,9 @@ void Hal_ReadEFuse( hal_ReadEFuse_BT(padapter, _offset, _size_byte, pbuf); } -static struct hal_version ReadChipVersion8723B(struct adapter *padapter) +static void ReadChipVersion8723B(struct adapter *padapter) { u32 value32; - struct hal_version ChipVersion; struct hal_com_data *pHalData; /* YJ, TODO, move read chip type here */ @@ -847,10 +846,6 @@ static struct hal_version ReadChipVersion8723B(struct adapter *padapter) pHalData->MultiFunc |= ((value32 & BT_FUNC_EN) ? RT_MULTI_FUNC_BT : 0); pHalData->MultiFunc |= ((value32 & GPS_FUNC_EN) ? RT_MULTI_FUNC_GPS : 0); pHalData->PolarityCtl = ((value32 & WL_HWPDN_SL) ? RT_POLARITY_HIGH_ACT : RT_POLARITY_LOW_ACT); - - pHalData->VersionID = ChipVersion; - - return ChipVersion; } void rtl8723b_read_chip_version(struct adapter *padapter) diff --git a/drivers/staging/rtl8723bs/include/HalVerDef.h b/drivers/staging/rtl8723bs/include/HalVerDef.h index ed6925872d564..9b607543133f2 100644 --- a/drivers/staging/rtl8723bs/include/HalVerDef.h +++ b/drivers/staging/rtl8723bs/include/HalVerDef.h @@ -41,10 +41,5 @@ enum hal_vendor_e { /* tag_HAL_Manufacturer_Version_Definition */ CHIP_VENDOR_SMIC = 2, }; -struct hal_version { /* tag_HAL_VERSION */ -}; - -/* hal_version VersionID; */ - #endif diff --git a/drivers/staging/rtl8723bs/include/hal_data.h b/drivers/staging/rtl8723bs/include/hal_data.h index 20b14e665d997..876b3666aa1cf 100644 --- a/drivers/staging/rtl8723bs/include/hal_data.h +++ b/drivers/staging/rtl8723bs/include/hal_data.h @@ -162,7 +162,6 @@ struct dm_priv { struct hal_com_data { - struct hal_version VersionID; enum rt_multi_func MultiFunc; /* For multi-function consideration. */ enum rt_polarity_ctl PolarityCtl; /* For Wifi PDn Polarity control. */ enum rt_regulator_mode RegulatorMode; /* switching regulator or LDO */