LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Michael Straube <straube.linux@gmail.com>
To: Martin Kaiser <martin@kaiser.cx>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Larry Finger <Larry.Finger@lwfinger.net>,
	Phillip Potter <phil@philpotter.co.uk>,
	Dan Carpenter <dan.carpenter@oracle.com>,
	linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 03/10] staging: rtl8188eu: use actual request type as parameter
Date: Sun, 22 Aug 2021 14:08:24 +0200	[thread overview]
Message-ID: <0e95cd4f-6374-76bf-86b3-115277f5e9d9@gmail.com> (raw)
In-Reply-To: <20210821164859.4351-3-martin@kaiser.cx>

On 8/21/21 6:48 PM, Martin Kaiser wrote:
> At the moment, usbctrl_vendorreq's requesttype parameter must be set to
> 1 for reading and 0 for writing. It's then converted to the actual
> bmRequestType for the USB control request. We can simplify the code and
> avoid this conversion if the caller passes the actual bmRequestType.
> 
> This patch is an adaptation of commit 788fde031027 ("staging: rtl8188eu:
> use actual request type as parameter") for the new r8188eu driver.
> 
> Signed-off-by: Martin Kaiser <martin@kaiser.cx>
> ---
>   drivers/staging/r8188eu/hal/usb_ops_linux.c | 46 ++++++---------------
>   1 file changed, 12 insertions(+), 34 deletions(-)
> 
> diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/r8188eu/hal/usb_ops_linux.c
> index a11a0597e515..dccb9fd34777 100644
> --- a/drivers/staging/r8188eu/hal/usb_ops_linux.c
> +++ b/drivers/staging/r8188eu/hal/usb_ops_linux.c
> @@ -15,7 +15,6 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u16 value, void *pdata,
>   	struct usb_device *udev = dvobjpriv->pusbdev;
>   	unsigned int pipe;
>   	int status = 0;
> -	u8 reqtype;
>   	u8 *pIo_buf;
>   	int vendorreq_times = 0;
>   
> @@ -44,26 +43,24 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u16 value, void *pdata,
>   	while (++vendorreq_times <= MAX_USBCTRL_VENDORREQ_TIMES) {
>   		memset(pIo_buf, 0, len);
>   
> -		if (requesttype == 0x01) {
> +		if (requesttype == REALTEK_USB_VENQT_READ) {
>   			pipe = usb_rcvctrlpipe(udev, 0);/* read_in */
> -			reqtype =  REALTEK_USB_VENQT_READ;
>   		} else {
>   			pipe = usb_sndctrlpipe(udev, 0);/* write_out */
> -			reqtype =  REALTEK_USB_VENQT_WRITE;
>   			memcpy(pIo_buf, pdata, len);
>   		}
>   
>   		status = usb_control_msg(udev, pipe, REALTEK_USB_VENQT_CMD_REQ,
> -					 reqtype, value, REALTEK_USB_VENQT_CMD_IDX,
> +					 requesttype, value, REALTEK_USB_VENQT_CMD_IDX,
>   					 pIo_buf, len, RTW_USB_CONTROL_MSG_TIMEOUT);
>   
>   		if (status == len) {   /*  Success this control transfer. */
>   			rtw_reset_continual_urb_error(dvobjpriv);
> -			if (requesttype == 0x01)
> +			if (requesttype == REALTEK_USB_VENQT_READ)
>   				memcpy(pdata, pIo_buf,  len);
>   		} else { /*  error cases */
>   			DBG_88E("reg 0x%x, usb %s %u fail, status:%d value=0x%x, vendorreq_times:%d\n",
> -				value, (requesttype == 0x01) ? "read" : "write",
> +				value, (requesttype == REALTEK_USB_VENQT_READ) ? "read" : "write",
>   				len, status, *(u32 *)pdata, vendorreq_times);
>   
>   			if (status < 0) {
> @@ -75,7 +72,7 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u16 value, void *pdata,
>   				}
>   			} else { /*  status != len && status >= 0 */
>   				if (status > 0) {
> -					if (requesttype == 0x01) {
> +					if (requesttype == REALTEK_USB_VENQT_READ) {
>   						/*  For Control read transfer, we have to copy the read data from pIo_buf to pdata. */
>   						memcpy(pdata, pIo_buf,  len);
>   					}
> @@ -101,19 +98,16 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u16 value, void *pdata,
>   
>   static u8 usb_read8(struct intf_hdl *pintfhdl, u32 addr)
>   {
> -	u8 requesttype;
>   	u16 wvalue;
>   	u16 len;
>   	u8 data = 0;
>   
>   
>   
> -	requesttype = 0x01;/* read_in */
> -
>   	wvalue = (u16)(addr & 0x0000ffff);
>   	len = 1;
>   
> -	usbctrl_vendorreq(pintfhdl, wvalue, &data, len, requesttype);
> +	usbctrl_vendorreq(pintfhdl, wvalue, &data, len, REALTEK_USB_VENQT_READ);
>   
>   
>   
> @@ -123,57 +117,49 @@ static u8 usb_read8(struct intf_hdl *pintfhdl, u32 addr)
>   
>   static u16 usb_read16(struct intf_hdl *pintfhdl, u32 addr)
>   {
> -	u8 requesttype;
>   	u16 wvalue;
>   	u16 len;
>   	__le32 data;
>   
> -	requesttype = 0x01;/* read_in */
>   	wvalue = (u16)(addr & 0x0000ffff);
>   	len = 2;
> -	usbctrl_vendorreq(pintfhdl, wvalue, &data, len, requesttype);
> +	usbctrl_vendorreq(pintfhdl, wvalue, &data, len, REALTEK_USB_VENQT_READ);
>   
>   	return (u16)(le32_to_cpu(data) & 0xffff);
>   }
>   
>   static u32 usb_read32(struct intf_hdl *pintfhdl, u32 addr)
>   {
> -	u8 requesttype;
>   	u16 wvalue;
>   	u16 len;
>   	__le32 data;
>   
> -	requesttype = 0x01;/* read_in */
> -
>   	wvalue = (u16)(addr & 0x0000ffff);
>   	len = 4;
>   
> -	usbctrl_vendorreq(pintfhdl, wvalue, &data, len, requesttype);
> +	usbctrl_vendorreq(pintfhdl, wvalue, &data, len, REALTEK_USB_VENQT_READ);
>   
>   	return le32_to_cpu(data);
>   }
>   
>   static int usb_write8(struct intf_hdl *pintfhdl, u32 addr, u8 val)
>   {
> -	u8 requesttype;
>   	u16 wvalue;
>   	u16 len;
>   	u8 data;
>   	int ret;
>   
>   
> -	requesttype = 0x00;/* write_out */
>   	wvalue = (u16)(addr & 0x0000ffff);
>   	len = 1;
>   	data = val;
> -	ret = usbctrl_vendorreq(pintfhdl, wvalue, &data, len, requesttype);
> +	ret = usbctrl_vendorreq(pintfhdl, wvalue, &data, len, REALTEK_USB_VENQT_WRITE);
>   
>   	return ret;
>   }
>   
>   static int usb_write16(struct intf_hdl *pintfhdl, u32 addr, u16 val)
>   {
> -	u8 requesttype;
>   	u16 wvalue;
>   	u16 len;
>   	__le32 data;
> @@ -181,14 +167,12 @@ static int usb_write16(struct intf_hdl *pintfhdl, u32 addr, u16 val)
>   
>   
>   
> -	requesttype = 0x00;/* write_out */
> -
>   	wvalue = (u16)(addr & 0x0000ffff);
>   	len = 2;
>   
>   	data = cpu_to_le32(val & 0x0000ffff);
>   
> -	ret = usbctrl_vendorreq(pintfhdl, wvalue, &data, len, requesttype);
> +	ret = usbctrl_vendorreq(pintfhdl, wvalue, &data, len, REALTEK_USB_VENQT_WRITE);
>   
>   
>   
> @@ -197,7 +181,6 @@ static int usb_write16(struct intf_hdl *pintfhdl, u32 addr, u16 val)
>   
>   static int usb_write32(struct intf_hdl *pintfhdl, u32 addr, u32 val)
>   {
> -	u8 requesttype;
>   	u16 wvalue;
>   	u16 len;
>   	__le32 data;
> @@ -205,13 +188,11 @@ static int usb_write32(struct intf_hdl *pintfhdl, u32 addr, u32 val)
>   
>   
>   
> -	requesttype = 0x00;/* write_out */
> -
>   	wvalue = (u16)(addr & 0x0000ffff);
>   	len = 4;
>   	data = cpu_to_le32(val);
>   
> -	ret = usbctrl_vendorreq(pintfhdl, wvalue, &data, len, requesttype);
> +	ret = usbctrl_vendorreq(pintfhdl, wvalue, &data, len, REALTEK_USB_VENQT_WRITE);
>   
>   
>   
> @@ -220,7 +201,6 @@ static int usb_write32(struct intf_hdl *pintfhdl, u32 addr, u32 val)
>   
>   static int usb_writeN(struct intf_hdl *pintfhdl, u32 addr, u32 length, u8 *pdata)
>   {
> -	u8 requesttype;
>   	u16 wvalue;
>   	u16 len;
>   	u8 buf[VENDOR_CMD_MAX_DATA_LEN] = {0};
> @@ -228,13 +208,11 @@ static int usb_writeN(struct intf_hdl *pintfhdl, u32 addr, u32 length, u8 *pdata
>   
>   
>   
> -	requesttype = 0x00;/* write_out */
> -
>   	wvalue = (u16)(addr & 0x0000ffff);
>   	len = length;
>   	memcpy(buf, pdata, len);
>   
> -	ret = usbctrl_vendorreq(pintfhdl, wvalue, buf, len, requesttype);
> +	ret = usbctrl_vendorreq(pintfhdl, wvalue, buf, len, REALTEK_USB_VENQT_WRITE);
>   
>   	return ret;
>   }
> 

Looks good to me.

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

Thanks,
Michael

  parent reply	other threads:[~2021-08-22 12:09 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-21 16:48 [PATCH 01/10] staging: r8188eu: remove unnecessary cast Martin Kaiser
2021-08-21 16:48 ` [PATCH 02/10] staging: r8188eu: remove unused define Martin Kaiser
2021-08-21 17:27   ` Phillip Potter
2021-08-22 11:56   ` Michael Straube
2021-08-21 16:48 ` [PATCH 03/10] staging: rtl8188eu: use actual request type as parameter Martin Kaiser
2021-08-21 17:44   ` Phillip Potter
2021-08-22 12:08   ` Michael Straube [this message]
2021-08-21 16:48 ` [PATCH 04/10] staging: r8188eu: rewrite usb vendor request defines Martin Kaiser
2021-08-21 17:45   ` Phillip Potter
2021-08-22 12:18   ` Michael Straube
2021-08-21 16:48 ` [PATCH 05/10] staging: r8188eu: remove an unused enum Martin Kaiser
2021-08-21 17:29   ` Phillip Potter
2021-08-22 12:19   ` Michael Straube
2021-08-21 16:48 ` [PATCH 06/10] staging: r8188eu: clean up the usb_readXY functions Martin Kaiser
2021-08-21 17:45   ` Phillip Potter
2021-08-22 12:25   ` Michael Straube
2021-08-21 16:48 ` [PATCH 07/10] staging: r8188eu: clean up the usb_writeXY functions Martin Kaiser
2021-08-21 17:46   ` Phillip Potter
2021-08-22 12:27   ` Michael Straube
2021-08-21 16:48 ` [PATCH 08/10] staging: r8188eu: clean up the usb_writeN Martin Kaiser
2021-08-21 17:47   ` Phillip Potter
2021-08-22 13:24   ` Michael Straube
2021-08-22 16:58     ` Martin Kaiser
2021-08-22 17:17       ` Michael Straube
2021-08-21 16:48 ` [PATCH 09/10] staging: r8188eu: remove unused members of struct _io_ops Martin Kaiser
2021-08-21 17:29   ` Phillip Potter
2021-08-22 13:28   ` Michael Straube
2021-08-21 16:48 ` [PATCH 10/10] staging: r8188eu: set pipe only once Martin Kaiser
2021-08-21 17:47   ` Phillip Potter
2021-08-22 14:05   ` Michael Straube
2021-08-21 17:27 ` [PATCH 01/10] staging: r8188eu: remove unnecessary cast Phillip Potter
2021-08-22 17:04   ` Martin Kaiser
2021-08-22 23:49     ` Phillip Potter
2021-08-22 11:54 ` Michael Straube

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=0e95cd4f-6374-76bf-86b3-115277f5e9d9@gmail.com \
    --to=straube.linux@gmail.com \
    --cc=Larry.Finger@lwfinger.net \
    --cc=dan.carpenter@oracle.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-staging@lists.linux.dev \
    --cc=martin@kaiser.cx \
    --cc=phil@philpotter.co.uk \
    --subject='Re: [PATCH 03/10] staging: rtl8188eu: use actual request type as parameter' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).