[PATCH v3 2/2] staging: r8188eu: Make clean-ups in usbctrl_vendorreq()

Fabio M. De Francesco
2021-08-25T03:53:32Z

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>
---

v2->v3: No changes.
v1->v2: No changes.

drivers/staging/r8188eu/hal/usb_ops_linux.c | 22 ++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/r8188eu/hal/usb_ops_linux.c
index 21581ca5f214..85da4fb5bf12 100644
--- a/drivers/staging/r8188eu/hal/usb_ops_linux.c
+++ b/drivers/staging/r8188eu/hal/usb_ops_linux.c
@@ -10,13 +10,13 @@
#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;
int status = 0;
- u8 *pIo_buf;
+ u8 *io_buf;
int vendorreq_times = 0;

if ((adapt->bSurpriseRemoved) || (adapt->pwrctrlpriv.pnp_bstop_trx)) {
@@ -33,10 +33,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;
}
@@ -45,14 +45,14 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u16 value, void *pdata,
if (requesttype == 0x01) {
status = usb_control_msg_recv(udev, 0, REALTEK_USB_VENQT_CMD_REQ,
REALTEK_USB_VENQT_READ, value,
- REALTEK_USB_VENQT_CMD_IDX, pIo_buf,
+ REALTEK_USB_VENQT_CMD_IDX, 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, 0, REALTEK_USB_VENQT_CMD_REQ,
REALTEK_USB_VENQT_WRITE, value,
- REALTEK_USB_VENQT_CMD_IDX, pIo_buf,
+ REALTEK_USB_VENQT_CMD_IDX, io_buf,
len, RTW_USB_CONTROL_MSG_TIMEOUT,
GFP_KERNEL);
}
@@ -60,11 +60,11 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u16 value, void *pdata,
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 == (-ESHUTDOWN) || status == -ENODEV) {
adapt->bSurpriseRemoved = true;
--
2.32.0