LKML Archive on lore.kernel.org help / color / mirror / Atom feed
From: "Fabio M. De Francesco" <fmdefrancesco@gmail.com> To: Larry Finger <Larry.Finger@lwfinger.net>, Phillip Potter <phil@philpotter.co.uk>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Pavel Skripkin <paskripkin@gmail.com> Cc: "Fabio M. De Francesco" <fmdefrancesco@gmail.com> Subject: [PATCH 2/2] staging: r8188eu: Make some clean-ups in usbctrl_vendorreq() Date: Tue, 24 Aug 2021 00:37:51 +0200 [thread overview] Message-ID: <20210823223751.25104-3-fmdefrancesco@gmail.com> (raw) In-Reply-To: <20210823223751.25104-1-fmdefrancesco@gmail.com> 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@gmail.com> --- 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
next prev parent reply other threads:[~2021-08-23 22:38 UTC|newest] Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-08-23 22:37 [PATCH 0/2] staging: r8188eu: Use new usb_control_msg_recv/send() Fabio M. De Francesco 2021-08-23 22:37 ` [PATCH 1/2] staging: r8188eu: Use usb_control_msg_recv/send() in usbctrl_vendorreq() Fabio M. De Francesco 2021-08-24 0:08 ` Phillip Potter 2021-08-24 0:31 ` Fabio M. De Francesco 2021-08-24 1:38 ` Fabio M. De Francesco 2021-08-24 2:01 ` Fabio M. De Francesco 2021-08-24 5:44 ` Christophe JAILLET 2021-08-24 10:38 ` Fabio M. De Francesco 2021-08-24 17:03 ` Christophe JAILLET 2021-08-24 21:59 ` Phillip Potter 2021-08-24 8:13 ` Pavel Skripkin 2021-08-24 8:53 ` Fabio M. De Francesco 2021-08-24 11:07 ` Pavel Skripkin 2021-08-24 12:01 ` Fabio M. De Francesco 2021-08-24 12:09 ` Pavel Skripkin 2021-08-24 14:55 ` Fabio M. De Francesco 2021-08-23 22:37 ` Fabio M. De Francesco [this message] 2021-08-24 0:10 ` [PATCH 2/2] staging: r8188eu: Make some clean-ups " Phillip Potter 2021-08-24 14:28 [PATCH v2 0/2] staging: r8188eu: Use new usb_control_msg_recv/send() Fabio M. De Francesco 2021-08-24 14:28 ` [PATCH 2/2] staging: r8188eu: Make some clean-ups in usbctrl_vendorreq() Fabio M. De Francesco 2021-08-24 14:39 ` Pavel Skripkin 2021-08-24 15:15 ` Fabio M. De Francesco 2021-08-24 15:26 ` Pavel Skripkin 2021-08-24 15:39 ` Fabio M. De Francesco 2021-08-24 15:43 ` Pavel Skripkin 2021-08-24 15:59 ` Fabio M. De Francesco 2021-08-24 16:04 ` Pavel Skripkin 2021-08-24 16:18 ` Greg Kroah-Hartman 2021-08-24 16:24 ` Pavel Skripkin 2021-08-24 22:20 ` Phillip Potter
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=20210823223751.25104-3-fmdefrancesco@gmail.com \ --to=fmdefrancesco@gmail.com \ --cc=Larry.Finger@lwfinger.net \ --cc=gregkh@linuxfoundation.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-staging@lists.linux.dev \ --cc=paskripkin@gmail.com \ --cc=phil@philpotter.co.uk \ /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: linkBe 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).