Commit 58673de5 authored by Fabio M. De Francesco's avatar Fabio M. De Francesco Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: clean up symbols in usbctrl_vendorreq() 



Clean up symbol names in usbctrl_vendorreq():

	pdata => data;
	pio_priv => io_priv;
	pintfhdl => intf.

Co-developed-by: default avatarPavel Skripkin <paskripkin@gmail.com>
Signed-off-by: default avatarPavel Skripkin <paskripkin@gmail.com>
Signed-off-by: default avatarFabio M. De Francesco <fmdefrancesco@gmail.com>
Link: https://lore.kernel.org/r/20210924122705.3781-2-fmdefrancesco@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 326db0e7

drivers/staging/r8188eu/hal/usb_ops_linux.c

+14 −14
Original line number Diff line number Diff line
@@ -8,14 +8,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 *intf, u16 value, void *data, u16 len, u8 requesttype)

{

	struct adapter	*adapt = pintfhdl->padapter;

	struct adapter *adapt = intf->padapter;

	struct dvobj_priv *dvobjpriv = adapter_to_dvobj(adapt);

	struct usb_device *udev = dvobjpriv->pusbdev;

	unsigned int pipe;

	int status = 0;

	u8 *pIo_buf;

	u8 *io_buf;

	int vendorreq_times = 0;



	if ((adapt->bSurpriseRemoved) || (adapt->pwrctrlpriv.pnp_bstop_trx)) {
@@ -32,10 +32,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,22 +47,22 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u16 value, void *pdata, 


	while (++vendorreq_times <= MAX_USBCTRL_VENDORREQ_TIMES) {

		if (requesttype == REALTEK_USB_VENQT_READ)

			memset(pIo_buf, 0, len);

			memset(io_buf, 0, len);

		else

			memcpy(pIo_buf, pdata, len);

			memcpy(io_buf, data, len);



		status = usb_control_msg(udev, pipe, REALTEK_USB_VENQT_CMD_REQ,

					 requesttype, value, REALTEK_USB_VENQT_CMD_IDX,

					 pIo_buf, len, RTW_USB_CONTROL_MSG_TIMEOUT);

					 io_buf, len, RTW_USB_CONTROL_MSG_TIMEOUT);



		if (status == len) {   /*  Success this control transfer. */

			rtw_reset_continual_urb_error(dvobjpriv);

			if (requesttype == REALTEK_USB_VENQT_READ)

				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 == REALTEK_USB_VENQT_READ) ? "read" : "write",

				len, status, *(u32 *)pdata, vendorreq_times);

				len, status, *(u32 *)data, vendorreq_times);



			if (status < 0) {

				if (status == -ESHUTDOWN || status == -ENODEV) {
@@ -74,8 +74,8 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u16 value, void *pdata, 
			} else { /*  status != len && status >= 0 */

				if (status > 0) {

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

						/*  For Control read transfer, we have to copy the read data from io_buf to data. */

						memcpy(data, io_buf,  len);

					}

				}

			}