[PATCH] staging: rtl8723bs: remove todo/note and duplicated EFUSE_CTRL macro

[PATCH] staging: rtl8723bs: remove todo/note and duplicated EFUSE_CTRL macro

[Rodrigo Gobbi]

The usage of EFUSE_xxx and MSR macros are already in place, so the note
and todo about that can be removed. Also, there was a duplication of the
definition of EFUSE_CTRL macro in two places, keep the one at the .h file.

Signed-off-by: Rodrigo Gobbi <rodrigo.gobbi.7@gmail.com>
---
At drivers/staging/rtl8723bs/include/hal_com_reg.h file, there is the following note/TODO:

/*  TODO: use these definition when using REG_xxx naming rule. */
/*  NOTE: DO NOT Remove these definition. Use later. */

#define EFUSE_CTRL				REG_EFUSE_CTRL		/*  E-Fuse Control. */
#define EFUSE_TEST				REG_EFUSE_TEST		/*  E-Fuse Test. */
#define MSR						(REG_CR + 2)		/*  Media Status register */

I guess the idea was to standardize those macros rather using the REG_xxx_yyy ones.
In fact, when searching for a missusage of that, there is none, only a duplicated redefinition
of EFUSE_CTRL at drivers/staging/rtl8723bs/core/rtw_efuse.c.

If my interpretation is correct about that comment, I`m think we can remove the
note/TODO since it`s very old. Also, I`m removing the duplicated define, since
the hal_com_reg.h is already included at rtw_efuse.c.

Tks and regards.
---
 drivers/staging/rtl8723bs/core/rtw_efuse.c      | 3 ---
 drivers/staging/rtl8723bs/include/hal_com_reg.h | 4 ----
 2 files changed, 7 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_efuse.c b/drivers/staging/rtl8723bs/core/rtw_efuse.c
index 208373113a62..6391932e214b 100644
--- a/drivers/staging/rtl8723bs/core/rtw_efuse.c
+++ b/drivers/staging/rtl8723bs/core/rtw_efuse.c
@@ -26,9 +26,6 @@ u8 fakeBTEfuseContent[EFUSE_MAX_BT_BANK][EFUSE_MAX_HW_SIZE];
 u8 fakeBTEfuseInitMap[EFUSE_BT_MAX_MAP_LEN] = {0};
 u8 fakeBTEfuseModifiedMap[EFUSE_BT_MAX_MAP_LEN] = {0};
 
-#define REG_EFUSE_CTRL		0x0030
-#define EFUSE_CTRL			REG_EFUSE_CTRL		/*  E-Fuse Control. */
-
 static bool
 Efuse_Read1ByteFromFakeContent(u16 Offset, u8 *Value)
 {
diff --git a/drivers/staging/rtl8723bs/include/hal_com_reg.h b/drivers/staging/rtl8723bs/include/hal_com_reg.h
index 9a02ae69d7a4..cf5c15dc2bfd 100644
--- a/drivers/staging/rtl8723bs/include/hal_com_reg.h
+++ b/drivers/staging/rtl8723bs/include/hal_com_reg.h
@@ -189,10 +189,6 @@
 /* 	Redifine 8192C register definition for compatibility */
 /*  */
 /*  */
-
-/*  TODO: use these definition when using REG_xxx naming rule. */
-/*  NOTE: DO NOT Remove these definition. Use later. */
-
 #define EFUSE_CTRL				REG_EFUSE_CTRL		/*  E-Fuse Control. */
 #define EFUSE_TEST				REG_EFUSE_TEST		/*  E-Fuse Test. */
 #define MSR						(REG_CR + 2)		/*  Media Status register */
-- 
2.48.1

Re: [PATCH] staging: rtl8723bs: remove todo/note and duplicated EFUSE_CTRL macro

[Greg KH]

On Fri, Oct 10, 2025 at 03:49:12PM -0300, Rodrigo Gobbi wrote:
> The usage of EFUSE_xxx and MSR macros are already in place, so the note
> and todo about that can be removed. Also, there was a duplication of the
> definition of EFUSE_CTRL macro in two places, keep the one at the .h file.
> 
> Signed-off-by: Rodrigo Gobbi <rodrigo.gobbi.7@gmail.com>
> ---
> At drivers/staging/rtl8723bs/include/hal_com_reg.h file, there is the following note/TODO:
> 
> /*  TODO: use these definition when using REG_xxx naming rule. */
> /*  NOTE: DO NOT Remove these definition. Use later. */
> 
> #define EFUSE_CTRL				REG_EFUSE_CTRL		/*  E-Fuse Control. */
> #define EFUSE_TEST				REG_EFUSE_TEST		/*  E-Fuse Test. */
> #define MSR						(REG_CR + 2)		/*  Media Status register */
> 
> I guess the idea was to standardize those macros rather using the REG_xxx_yyy ones.
> In fact, when searching for a missusage of that, there is none, only a duplicated redefinition
> of EFUSE_CTRL at drivers/staging/rtl8723bs/core/rtw_efuse.c.
> 
> If my interpretation is correct about that comment, I`m think we can remove the
> note/TODO since it`s very old. Also, I`m removing the duplicated define, since
> the hal_com_reg.h is already included at rtw_efuse.c.
> 
> Tks and regards.
> ---
>  drivers/staging/rtl8723bs/core/rtw_efuse.c      | 3 ---
>  drivers/staging/rtl8723bs/include/hal_com_reg.h | 4 ----
>  2 files changed, 7 deletions(-)
> 
> diff --git a/drivers/staging/rtl8723bs/core/rtw_efuse.c b/drivers/staging/rtl8723bs/core/rtw_efuse.c
> index 208373113a62..6391932e214b 100644
> --- a/drivers/staging/rtl8723bs/core/rtw_efuse.c
> +++ b/drivers/staging/rtl8723bs/core/rtw_efuse.c
> @@ -26,9 +26,6 @@ u8 fakeBTEfuseContent[EFUSE_MAX_BT_BANK][EFUSE_MAX_HW_SIZE];
>  u8 fakeBTEfuseInitMap[EFUSE_BT_MAX_MAP_LEN] = {0};
>  u8 fakeBTEfuseModifiedMap[EFUSE_BT_MAX_MAP_LEN] = {0};
>  
> -#define REG_EFUSE_CTRL		0x0030
> -#define EFUSE_CTRL			REG_EFUSE_CTRL		/*  E-Fuse Control. */
> -
>  static bool
>  Efuse_Read1ByteFromFakeContent(u16 Offset, u8 *Value)
>  {
> diff --git a/drivers/staging/rtl8723bs/include/hal_com_reg.h b/drivers/staging/rtl8723bs/include/hal_com_reg.h
> index 9a02ae69d7a4..cf5c15dc2bfd 100644
> --- a/drivers/staging/rtl8723bs/include/hal_com_reg.h
> +++ b/drivers/staging/rtl8723bs/include/hal_com_reg.h
> @@ -189,10 +189,6 @@
>  /* 	Redifine 8192C register definition for compatibility */
>  /*  */
>  /*  */
> -
> -/*  TODO: use these definition when using REG_xxx naming rule. */
> -/*  NOTE: DO NOT Remove these definition. Use later. */
> -
>  #define EFUSE_CTRL				REG_EFUSE_CTRL		/*  E-Fuse Control. */
>  #define EFUSE_TEST				REG_EFUSE_TEST		/*  E-Fuse Test. */
>  #define MSR						(REG_CR + 2)		/*  Media Status register */
> -- 
> 2.48.1
> 

Does not apply to my tree at all :(

Can you rebase against the next linux-next release and resend?

thanks,

greg k-h