From: Nikolay Kulikov Date: Sat, 2 May 2026 21:55:41 +0000 (+0300) Subject: staging: rtl8723bs: replace type and rename the chip_type field X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=6d168099f1b10d8046681040ccf2ad6fa9b8685d;p=thirdparty%2Fkernel%2Flinux.git staging: rtl8723bs: replace type and rename the chip_type field The 'chip_type' field always accepts one value from the hal_chip_type_e enumeration: TEST_CHIP or NORMAL_CHIP (FPGA is never used). Changing this field's type to bool will allow it to be used directly in conditions without the need for wrapped macros. The new type requires a corresponding variable name, so rename it to 'chip_normal' to improve code readability. Signed-off-by: Nikolay Kulikov Link: https://patch.msgid.link/20260502220056.59815-3-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 a4e7bf0e8a97d..87da5f908e1aa 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c @@ -836,7 +836,7 @@ static struct hal_version ReadChipVersion8723B(struct adapter *padapter) value32 = rtw_read32(padapter, REG_SYS_CFG); ChipVersion.ICType = CHIP_8723B; - ChipVersion.chip_type = ((value32 & RTL_ID) ? TEST_CHIP : NORMAL_CHIP); + ChipVersion.chip_normal = ((value32 & RTL_ID) ? false : true); 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) */ @@ -912,7 +912,7 @@ void _InitBurstPktLen_8723BS(struct adapter *Adapter) /* ARFB table 9 for 11ac 5G 2SS */ rtw_write32(Adapter, REG_ARFR0_8723B, 0x00000010); - if (IS_NORMAL_CHIP(pHalData->VersionID)) + if (pHalData->VersionID.chip_normal) rtw_write32(Adapter, REG_ARFR0_8723B+4, 0xfffff000); else rtw_write32(Adapter, REG_ARFR0_8723B+4, 0x3e0ff000); diff --git a/drivers/staging/rtl8723bs/include/HalVerDef.h b/drivers/staging/rtl8723bs/include/HalVerDef.h index bf4716ec18e82..fbdfb690b73be 100644 --- a/drivers/staging/rtl8723bs/include/HalVerDef.h +++ b/drivers/staging/rtl8723bs/include/HalVerDef.h @@ -43,7 +43,7 @@ enum hal_vendor_e { /* tag_HAL_Manufacturer_Version_Definition */ struct hal_version { /* tag_HAL_VERSION */ enum hal_ic_type_e ICType; - enum hal_chip_type_e chip_type; + bool chip_normal; /* true - normal chip, false - test chip */ enum hal_cut_version_e CUTVersion; enum hal_vendor_e VendorType; u8 ROMVer;