On Mon, 23 Aug 2021 at 23:38, Fabio M. De Francesco
<fmdefrancesco@xxxxxxxxx> wrote:
>
> After replacing usb_control_msg() with the new usb_control_msg_recv() and
> usb_control_msg_send() API of USB Core, remove camelcase from the pIo_buf
> variable that is passed as argument to the new API and remove the initial
> 'p' (that probably stands for "pointer") from the same pIo_buf and from
> the pintfhdl and pdata arguments of usbctrl_vendorreq().
>
> Signed-off-by: Fabio M. De Francesco <fmdefrancesco@xxxxxxxxx>
> ---
> drivers/staging/r8188eu/hal/usb_ops_linux.c | 26 ++++++++++-----------
> 1 file changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/r8188eu/hal/usb_ops_linux.c
> index 6f51660b967a..5ce31ae18ed8 100644
> --- a/drivers/staging/r8188eu/hal/usb_ops_linux.c
> +++ b/drivers/staging/r8188eu/hal/usb_ops_linux.c
> @@ -10,14 +10,14 @@
> #include "../include/recv_osdep.h"
> #include "../include/rtl8188e_hal.h"
>
> -static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u16 value, void *pdata, u16 len, u8 requesttype)
> +static int usbctrl_vendorreq(struct intf_hdl *intfhdl, u16 value, void *data, u16 len, u8 requesttype)
> {
> - struct adapter *adapt = pintfhdl->padapter;
> + struct adapter *adapt = intfhdl->padapter;
> struct dvobj_priv *dvobjpriv = adapter_to_dvobj(adapt);
> struct usb_device *udev = dvobjpriv->pusbdev;
> u8 pipe;
> int status = 0;
> - u8 *pIo_buf;
> + u8 *io_buf;
> int vendorreq_times = 0;
>
> if ((adapt->bSurpriseRemoved) || (adapt->pwrctrlpriv.pnp_bstop_trx)) {
> @@ -34,10 +34,10 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u16 value, void *pdata,
> mutex_lock(&dvobjpriv->usb_vendor_req_mutex);
>
> /* Acquire IO memory for vendorreq */
> - pIo_buf = dvobjpriv->usb_vendor_req_buf;
> + io_buf = dvobjpriv->usb_vendor_req_buf;
>
> - if (!pIo_buf) {
> - DBG_88E("[%s] pIo_buf == NULL\n", __func__);
> + if (!io_buf) {
> + DBG_88E("[%s] io_buf == NULL\n", __func__);
> status = -ENOMEM;
> goto release_mutex;
> }
> @@ -47,25 +47,25 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u16 value, void *pdata,
> status = usb_control_msg_recv(udev, pipe, REALTEK_USB_VENQT_CMD_REQ,
> REALTEK_USB_VENQT_READ, value,
> REALTEK_USB_VENQT_CMD_IDX,
> - pIo_buf, len, RTW_USB_CONTROL_MSG_TIMEOUT,
> + io_buf, len, RTW_USB_CONTROL_MSG_TIMEOUT,
> GFP_KERNEL);
> } else {
> - memcpy(pIo_buf, pdata, len);
> + memcpy(io_buf, data, len);
> status = usb_control_msg_send(udev, pipe, REALTEK_USB_VENQT_CMD_REQ,
> REALTEK_USB_VENQT_WRITE, value,
> REALTEK_USB_VENQT_CMD_IDX,
> - pIo_buf, len, RTW_USB_CONTROL_MSG_TIMEOUT,
> + io_buf, len, RTW_USB_CONTROL_MSG_TIMEOUT,
> GFP_KERNEL);
> }
>
> if (!status) { /* Success this control transfer. */
> rtw_reset_continual_urb_error(dvobjpriv);
> if (requesttype == 0x01)
> - memcpy(pdata, pIo_buf, len);
> + memcpy(data, io_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",
> - len, status, *(u32 *)pdata, vendorreq_times);
> + len, status, *(u32 *)data, vendorreq_times);
>
> if (status < 0) {
> if (status == (-ESHUTDOWN) || status == -ENODEV) {
> @@ -77,8 +77,8 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u16 value, void *pdata,
> } else { /* status != len && status >= 0 */
> if (status > 0) {
> if (requesttype == 0x01) {
> - /* For Control read transfer, we have to copy the read data from pIo_buf to pdata. */
> - memcpy(pdata, pIo_buf, len);
> + /* For Control read transfer, we have to copy the read data from io_buf to data. */
> + memcpy(data, io_buf, len);
> }
> }
> }
> --
> 2.32.0
>
Dear Fabio,
This one doesn't apply at all for me - it may just be because of the
churn in my local tree though, I don't have all previous patches
applied as I've been testing select series etc. Many thanks.
Regards,
Phil
