linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Phillip Potter <phil@philpotter.co.uk>
To: Martin Kaiser <martin@kaiser.cx>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Larry Finger <Larry.Finger@lwfinger.net>,
	Dan Carpenter <dan.carpenter@oracle.com>,
	Michael Straube <straube.linux@gmail.com>,
	linux-staging@lists.linux.dev,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 1/2] staging: r8188eu: ctrl vendor req value is always 0x05
Date: Wed, 18 Aug 2021 21:33:47 +0100	[thread overview]
Message-ID: <CAA=Fs0mOv=VfjV94NgA=dhKEDoSijWMxa-7LtyRwg3NuLNHPjQ@mail.gmail.com> (raw)
In-Reply-To: <20210818200041.10870-1-martin@kaiser.cx>

On Wed, 18 Aug 2021 at 21:00, Martin Kaiser <martin@kaiser.cx> wrote:
>
> The bRequest value for the vendor specific control requests sent by this
> driver is always 0x05. Replace the function parameter with the define from
> usb_ops.h.
>
> This patch is an adaptation of commit eeb4661560ff ("staging: rtl8188eu:
> ctrl vendor req value is always 0x05") for the new r8188eu driver.
>
> Signed-off-by: Martin Kaiser <martin@kaiser.cx>
> ---
>  drivers/staging/r8188eu/hal/usb_ops_linux.c | 33 +++++++--------------
>  1 file changed, 10 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/r8188eu/hal/usb_ops_linux.c
> index b4edbfda9a18..2583e3a941fd 100644
> --- a/drivers/staging/r8188eu/hal/usb_ops_linux.c
> +++ b/drivers/staging/r8188eu/hal/usb_ops_linux.c
> @@ -10,7 +10,7 @@
>  #include "../include/recv_osdep.h"
>  #include "../include/rtl8188e_hal.h"
>
> -static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u16 index, void *pdata, u16 len, u8 requesttype)
> +static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u16 value, u16 index, void *pdata, u16 len, u8 requesttype)
>  {
>         struct adapter  *adapt = pintfhdl->padapter;
>         struct dvobj_priv  *dvobjpriv = adapter_to_dvobj(adapt);
> @@ -55,7 +55,8 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u
>                         memcpy(pIo_buf, pdata, len);
>                 }
>
> -               status = usb_control_msg(udev, pipe, request, reqtype, value, index, pIo_buf, len, RTW_USB_CONTROL_MSG_TIMEOUT);
> +               status = usb_control_msg(udev, pipe, REALTEK_USB_VENQT_CMD_REQ,
> +                                        reqtype, value, index, pIo_buf, len, RTW_USB_CONTROL_MSG_TIMEOUT);
>
>                 if (status == len) {   /*  Success this control transfer. */
>                         rtw_reset_continual_urb_error(dvobjpriv);
> @@ -101,7 +102,6 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u
>
>  static u8 usb_read8(struct intf_hdl *pintfhdl, u32 addr)
>  {
> -       u8 request;
>         u8 requesttype;
>         u16 wvalue;
>         u16 index;
> @@ -110,14 +110,13 @@ static u8 usb_read8(struct intf_hdl *pintfhdl, u32 addr)
>
>
>
> -       request = 0x05;
>         requesttype = 0x01;/* read_in */
>         index = 0;/* n/a */
>
>         wvalue = (u16)(addr & 0x0000ffff);
>         len = 1;
>
> -       usbctrl_vendorreq(pintfhdl, request, wvalue, index, &data, len, requesttype);
> +       usbctrl_vendorreq(pintfhdl, wvalue, index, &data, len, requesttype);
>
>
>
> @@ -127,47 +126,42 @@ static u8 usb_read8(struct intf_hdl *pintfhdl, u32 addr)
>
>  static u16 usb_read16(struct intf_hdl *pintfhdl, u32 addr)
>  {
> -       u8 request;
>         u8 requesttype;
>         u16 wvalue;
>         u16 index;
>         u16 len;
>         __le32 data;
>
> -       request = 0x05;
>         requesttype = 0x01;/* read_in */
>         index = 0;/* n/a */
>         wvalue = (u16)(addr & 0x0000ffff);
>         len = 2;
> -       usbctrl_vendorreq(pintfhdl, request, wvalue, index, &data, len, requesttype);
> +       usbctrl_vendorreq(pintfhdl, wvalue, index, &data, len, requesttype);
>
>         return (u16)(le32_to_cpu(data) & 0xffff);
>  }
>
>  static u32 usb_read32(struct intf_hdl *pintfhdl, u32 addr)
>  {
> -       u8 request;
>         u8 requesttype;
>         u16 wvalue;
>         u16 index;
>         u16 len;
>         __le32 data;
>
> -       request = 0x05;
>         requesttype = 0x01;/* read_in */
>         index = 0;/* n/a */
>
>         wvalue = (u16)(addr & 0x0000ffff);
>         len = 4;
>
> -       usbctrl_vendorreq(pintfhdl, request, wvalue, index, &data, len, requesttype);
> +       usbctrl_vendorreq(pintfhdl, wvalue, index, &data, len, requesttype);
>
>         return le32_to_cpu(data);
>  }
>
>  static int usb_write8(struct intf_hdl *pintfhdl, u32 addr, u8 val)
>  {
> -       u8 request;
>         u8 requesttype;
>         u16 wvalue;
>         u16 index;
> @@ -176,20 +170,18 @@ static int usb_write8(struct intf_hdl *pintfhdl, u32 addr, u8 val)
>         int ret;
>
>
> -       request = 0x05;
>         requesttype = 0x00;/* write_out */
>         index = 0;/* n/a */
>         wvalue = (u16)(addr & 0x0000ffff);
>         len = 1;
>         data = val;
> -       ret = usbctrl_vendorreq(pintfhdl, request, wvalue, index, &data, len, requesttype);
> +       ret = usbctrl_vendorreq(pintfhdl, wvalue, index, &data, len, requesttype);
>
>         return ret;
>  }
>
>  static int usb_write16(struct intf_hdl *pintfhdl, u32 addr, u16 val)
>  {
> -       u8 request;
>         u8 requesttype;
>         u16 wvalue;
>         u16 index;
> @@ -199,7 +191,6 @@ static int usb_write16(struct intf_hdl *pintfhdl, u32 addr, u16 val)
>
>
>
> -       request = 0x05;
>         requesttype = 0x00;/* write_out */
>         index = 0;/* n/a */
>
> @@ -208,7 +199,7 @@ static int usb_write16(struct intf_hdl *pintfhdl, u32 addr, u16 val)
>
>         data = cpu_to_le32(val & 0x0000ffff);
>
> -       ret = usbctrl_vendorreq(pintfhdl, request, wvalue, index, &data, len, requesttype);
> +       ret = usbctrl_vendorreq(pintfhdl, wvalue, index, &data, len, requesttype);
>
>
>
> @@ -217,7 +208,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 request;
>         u8 requesttype;
>         u16 wvalue;
>         u16 index;
> @@ -227,7 +217,6 @@ static int usb_write32(struct intf_hdl *pintfhdl, u32 addr, u32 val)
>
>
>
> -       request = 0x05;
>         requesttype = 0x00;/* write_out */
>         index = 0;/* n/a */
>
> @@ -235,7 +224,7 @@ static int usb_write32(struct intf_hdl *pintfhdl, u32 addr, u32 val)
>         len = 4;
>         data = cpu_to_le32(val);
>
> -       ret = usbctrl_vendorreq(pintfhdl, request, wvalue, index, &data, len, requesttype);
> +       ret = usbctrl_vendorreq(pintfhdl, wvalue, index, &data, len, requesttype);
>
>
>
> @@ -244,7 +233,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 request;
>         u8 requesttype;
>         u16 wvalue;
>         u16 index;
> @@ -254,7 +242,6 @@ static int usb_writeN(struct intf_hdl *pintfhdl, u32 addr, u32 length, u8 *pdata
>
>
>
> -       request = 0x05;
>         requesttype = 0x00;/* write_out */
>         index = 0;/* n/a */
>
> @@ -262,7 +249,7 @@ static int usb_writeN(struct intf_hdl *pintfhdl, u32 addr, u32 length, u8 *pdata
>         len = length;
>         memcpy(buf, pdata, len);
>
> -       ret = usbctrl_vendorreq(pintfhdl, request, wvalue, index, buf, len, requesttype);
> +       ret = usbctrl_vendorreq(pintfhdl, wvalue, index, buf, len, requesttype);
>
>         return ret;
>  }
> --
> 2.20.1
>

Looks good.

Acked-by: Phillip Potter <phil@philpotter.co.uk>

Regards,
Phil

      parent reply	other threads:[~2021-08-18 20:34 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-18 20:00 [PATCH 1/2] staging: r8188eu: ctrl vendor req value is always 0x05 Martin Kaiser
2021-08-18 20:00 ` [PATCH 2/2] staging: r8188eu: ctrl vendor req index is not used Martin Kaiser
2021-08-18 20:34   ` Phillip Potter
2021-08-18 20:33 ` Phillip Potter [this message]

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='CAA=Fs0mOv=VfjV94NgA=dhKEDoSijWMxa-7LtyRwg3NuLNHPjQ@mail.gmail.com' \
    --to=phil@philpotter.co.uk \
    --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=straube.linux@gmail.com \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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).