Re: [PATCH] staging: rtl8723bs: remove leftover code for other chips

[Pavel Skripkin <paskripkin@gmail.com>]

Hi Artur,

On 4/16/22 14:13, Artur Bujdoso wrote:
> Clean up unreferenced register definitons in hal headers.
> 
> Signed-off-by: Artur Bujdoso <artur.bujdoso@gmail.com>
> ---
>   drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h  |  36 +--
>   drivers/staging/rtl8723bs/include/HalVerDef.h |  74 ++---
>   .../staging/rtl8723bs/include/hal_com_reg.h   | 297 +-----------------
>   3 files changed, 49 insertions(+), 358 deletions(-)
> 
> diff --git a/drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h b/drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h
> index af50674b2a65..706aafe86d0d 100644
> --- a/drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h
> +++ b/drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h
> @@ -70,38 +70,34 @@ enum btc_chip_interface {
>   
>   enum {
>   	BTC_CHIP_UNDEF		= 0,
> -	BTC_CHIP_CSR_BC4	= 1,
> -	BTC_CHIP_CSR_BC8	= 2,
> -	BTC_CHIP_RTL8723A	= 3,
> -	BTC_CHIP_RTL8821	= 4,
>   	BTC_CHIP_RTL8723B	= 5,
>   	BTC_CHIP_MAX
>   };
>   
>   /*  following is for wifi link status */
> -#define WIFI_STA_CONNECTED				BIT0
> -#define WIFI_AP_CONNECTED				BIT1
> -#define WIFI_HS_CONNECTED				BIT2
> +#define WIFI_STA_CONNECTED			BIT0
> +#define WIFI_AP_CONNECTED			BIT1
> +#define WIFI_HS_CONNECTED			BIT2
>   #define WIFI_P2P_GO_CONNECTED			BIT3
>   #define WIFI_P2P_GC_CONNECTED			BIT4
>   

Should be done in separate patch

>   struct btc_board_info {
>   	/*  The following is some board information */
>   	u8 btChipType;
> -	u8 pgAntNum;	/*  pg ant number */
> -	u8 btdmAntNum;	/*  ant number for btdm */
> +	u8 pgAntNum;		/*  pg ant number */
> +	u8 btdmAntNum;		/*  ant number for btdm */
>   	u8 btdmAntPos;		/* Bryant Add to indicate Antenna Position for (pgAntNum = 2) && (btdmAntNum = 1)  (DPDT+1Ant case) */
>   	u8 singleAntPath;	/*  current used for 8723b only, 1 =>s0,  0 =>s1 */
> -	/* bool				bBtExist; */
> +	/* bool			bBtExist; */
>   };
>   


Should be done in separate patch

>   enum {
> -	BTC_RSSI_STATE_HIGH			    = 0x0,
> -	BTC_RSSI_STATE_MEDIUM			= 0x1,
> -	BTC_RSSI_STATE_LOW			    = 0x2,
> -	BTC_RSSI_STATE_STAY_HIGH		= 0x3,
> -	BTC_RSSI_STATE_STAY_MEDIUM		= 0x4,
> -	BTC_RSSI_STATE_STAY_LOW			= 0x5,
> +	BTC_RSSI_STATE_HIGH		= 0x0,
> +	BTC_RSSI_STATE_MEDIUM		= 0x1,
> +	BTC_RSSI_STATE_LOW		= 0x2,
> +	BTC_RSSI_STATE_STAY_HIGH	= 0x3,
> +	BTC_RSSI_STATE_STAY_MEDIUM	= 0x4,
> +	BTC_RSSI_STATE_STAY_LOW		= 0x5,
>   	BTC_RSSI_MAX
>   };
>   #define BTC_RSSI_HIGH(_rssi_)	((_rssi_ == BTC_RSSI_STATE_HIGH || _rssi_ == BTC_RSSI_STATE_STAY_HIGH) ? true : false)
> @@ -122,7 +118,7 @@ enum {
>   };
>   
>   enum {
> -	BTC_WIFI_PNP_WAKE_UP		= 0x0,
> +	BTC_WIFI_PNP_WAKE_UP			= 0x0,
>   	BTC_WIFI_PNP_SLEEP			= 0x1,
>   	BTC_WIFI_PNP_MAX
>   };
> @@ -211,7 +207,7 @@ enum {
>   
>   enum {
>   	BTC_DBG_DISP_COEX_STATISTICS		= 0x0,
> -	BTC_DBG_DISP_BT_LINK_INFO			= 0x1,
> +	BTC_DBG_DISP_BT_LINK_INFO		= 0x1,
>   	BTC_DBG_DISP_FW_PWR_MODE_CMD		= 0x2,
>   	BTC_DBG_DISP_MAX
>   };
> @@ -235,13 +231,13 @@ enum {
>   };
>   
>   enum {
> -	BTC_ASSOCIATE_FINISH				= 0x0,
> +	BTC_ASSOCIATE_FINISH					= 0x0,
>   	BTC_ASSOCIATE_START					= 0x1,
>   	BTC_ASSOCIATE_MAX
>   };
>   
>   enum {
> -	BTC_MEDIA_DISCONNECT				= 0x0,
> +	BTC_MEDIA_DISCONNECT					= 0x0,
>   	BTC_MEDIA_CONNECT					= 0x1,
>   	BTC_MEDIA_MAX
>   };

All white-space clean ups should be done in separate patch


> diff --git a/drivers/staging/rtl8723bs/include/HalVerDef.h b/drivers/staging/rtl8723bs/include/HalVerDef.h
> index 8f654a49fb9d..42c8ff90e824 100644
> --- a/drivers/staging/rtl8723bs/include/HalVerDef.h
> +++ b/drivers/staging/rtl8723bs/include/HalVerDef.h
> @@ -9,38 +9,29 @@
>   
>   /*  hal_ic_type_e */
>   enum hal_ic_type_e { /* tag_HAL_IC_Type_Definition */
> -	CHIP_8192S	=	0,
> -	CHIP_8188C	=	1,
> -	CHIP_8192C	=	2,
> -	CHIP_8192D	=	3,
> -	CHIP_8723A	=	4,
> -	CHIP_8188E	=	5,
> -	CHIP_8812	=	6,
> -	CHIP_8821	=	7,
>   	CHIP_8723B	=	8,
> -	CHIP_8192E	=	9,
>   };
>   

Then why this enum is needed? ChipVersion.ICType looks set, but not used.

>   /* hal_chip_type_e */
>   enum hal_chip_type_e { /* tag_HAL_CHIP_Type_Definition */
> -	TEST_CHIP		=	0,
> +	TEST_CHIP	=	0,
>   	NORMAL_CHIP	=	1,
> -	FPGA			=	2,
> +	FPGA		=	2,
>   };
>   

Again white-space clean ups

>   /* hal_cut_version_e */
>   enum hal_cut_version_e { /* tag_HAL_Cut_Version_Definition */
> -	A_CUT_VERSION		=	0,
> -	B_CUT_VERSION		=	1,
> -	C_CUT_VERSION		=	2,
> -	D_CUT_VERSION		=	3,
> -	E_CUT_VERSION		=	4,
> -	F_CUT_VERSION		=	5,
> -	G_CUT_VERSION		=	6,
> -	H_CUT_VERSION		=	7,
> -	I_CUT_VERSION		=	8,
> -	J_CUT_VERSION		=	9,
> -	K_CUT_VERSION		=	10,
> +	A_CUT_VERSION	=	0,
> +	B_CUT_VERSION	=	1,
> +	C_CUT_VERSION	=	2,
> +	D_CUT_VERSION	=	3,
> +	E_CUT_VERSION	=	4,
> +	F_CUT_VERSION	=	5,
> +	G_CUT_VERSION	=	6,
> +	H_CUT_VERSION	=	7,
> +	I_CUT_VERSION	=	8,
> +	J_CUT_VERSION	=	9,
> +	K_CUT_VERSION	=	10,
>   };

and again...






With regards,
Pavel Skripkin