linux-kernel - Re: [PATCH 8/9] staging: r8188eu: interface type is always usb

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Wed, 6 Oct 2021 00:07:31 +0200
From:   Michael Straube <straube.linux@...il.com>
To:     Martin Kaiser <martin@...ser.cx>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Cc:     Larry Finger <Larry.Finger@...inger.net>,
        Phillip Potter <phil@...lpotter.co.uk>,
        linux-staging@...ts.linux.dev, linux-kernel@...r.kernel.org
Subject: Re: [PATCH 8/9] staging: r8188eu: interface type is always usb

On 10/5/21 22:08, Martin Kaiser wrote:
> This driver only supports chips that connect via usb. Remove
> interface_type from struct adapter, use a constant in the one
> place where the interface type is needed.
> 
> Signed-off-by: Martin Kaiser <martin@...ser.cx>
> ---
>   drivers/staging/r8188eu/hal/rtl8188e_dm.c   | 5 +----
>   drivers/staging/r8188eu/include/drv_types.h | 1 -
>   drivers/staging/r8188eu/include/hal_intf.h  | 7 -------
>   drivers/staging/r8188eu/os_dep/usb_intf.c   | 3 ---
>   4 files changed, 1 insertion(+), 15 deletions(-)
> 
> diff --git a/drivers/staging/r8188eu/hal/rtl8188e_dm.c b/drivers/staging/r8188eu/hal/rtl8188e_dm.c
> index 21494adf2a19..1a0176a60704 100644
> --- a/drivers/staging/r8188eu/hal/rtl8188e_dm.c
> +++ b/drivers/staging/r8188eu/hal/rtl8188e_dm.c
> @@ -40,10 +40,7 @@ static void Init_ODM_ComInfo_88E(struct adapter *Adapter)
>   
>   	ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_PLATFORM, ODM_CE);
>   
> -	if (Adapter->interface_type == RTW_GSPI)
> -		ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_INTERFACE, ODM_ITRF_SDIO);
> -	else
> -		ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_INTERFACE, Adapter->interface_type);/* RTL871X_HCI_TYPE */
> +	ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_INTERFACE, ODM_ITRF_USB);
>   
>   	ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_IC_TYPE, ODM_RTL8188E);
>   
> diff --git a/drivers/staging/r8188eu/include/drv_types.h b/drivers/staging/r8188eu/include/drv_types.h
> index 9b9f7d89519c..3c972acf329c 100644
> --- a/drivers/staging/r8188eu/include/drv_types.h
> +++ b/drivers/staging/r8188eu/include/drv_types.h
> @@ -205,7 +205,6 @@ struct adapter {
>   			     * replace module. */
>   	int	pid[3];/* process id from UI, 0:wps, 1:hostapd, 2:dhcpcd */
>   	int	bDongle;/* build-in module or external dongle */
> -	u16	interface_type;/* USB,SDIO,SPI,PCI */
>   
>   	struct dvobj_priv *dvobj;
>   	struct	mlme_priv mlmepriv;
> diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h
> index 89bd6f4b06e2..ffed6ddadd3f 100644
> --- a/drivers/staging/r8188eu/include/hal_intf.h
> +++ b/drivers/staging/r8188eu/include/hal_intf.h
> @@ -8,13 +8,6 @@
>   #include "drv_types.h"
>   #include "Hal8188EPhyCfg.h"
>   
> -enum RTL871X_HCI_TYPE {
> -	RTW_PCIE	= BIT(0),
> -	RTW_USB		= BIT(1),
> -	RTW_SDIO	= BIT(2),
> -	RTW_GSPI	= BIT(3),
> -};
> -
>   enum hw_variables {
>   	HW_VAR_MEDIA_STATUS,
>   	HW_VAR_MEDIA_STATUS1,
> diff --git a/drivers/staging/r8188eu/os_dep/usb_intf.c b/drivers/staging/r8188eu/os_dep/usb_intf.c
> index 193b5faac56a..5699c44a722b 100644
> --- a/drivers/staging/r8188eu/os_dep/usb_intf.c
> +++ b/drivers/staging/r8188eu/os_dep/usb_intf.c
> @@ -379,9 +379,6 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
>   
>   	padapter->hw_init_mutex = &usb_drv->hw_init_mutex;
>   
> -	/* step 1-1., decide the chip_type via vid/pid */
> -	padapter->interface_type = RTW_USB;
> -
>   	if (rtw_handle_dualmac(padapter, 1) != _SUCCESS)
>   		goto free_adapter;
>   
> 

Looks good to me.

Acked-by: Michael Straube <straube.linux@...il.com>

Thanks,
Michael