Commit 86949b52 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

staging: r8188eu: remove rtw_usb_control_msg() macro 

It is a wrapper around usb_control_msg() that does nothing, so remove
the macro and just call the correct USB function instead in the one
place it is used.

Link: https://lore.kernel.org/r/20210730092417.1014392-12-gregkh@linuxfoundation.org


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

drivers/staging/r8188eu/hal/usb_ops_linux.c

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u 
			memcpy(pIo_buf, pdata, len);

		}



		status = rtw_usb_control_msg(udev, pipe, request, reqtype, value, index, pIo_buf, len, RTW_USB_CONTROL_MSG_TIMEOUT);

		status = usb_control_msg(udev, pipe, request, reqtype, value, index, pIo_buf, len, RTW_USB_CONTROL_MSG_TIMEOUT);



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

			rtw_reset_continual_urb_error(dvobjpriv);

drivers/staging/r8188eu/include/usb_ops.h

+0 −4
Original line number Diff line number Diff line
@@ -21,10 +21,6 @@ enum { 
#define MAX_VENDOR_REQ_CMD_SIZE	254	/* 8188cu SIE Support */

#define MAX_USB_IO_CTL_SIZE	(MAX_VENDOR_REQ_CMD_SIZE + ALIGNMENT_UNIT)



#define rtw_usb_control_msg(dev, pipe, request, requesttype,		\

			    value, index, data, size, timeout_ms)	\

	usb_control_msg((dev), (pipe), (request), (requesttype), (value),\

			(index), (data), (size), (timeout_ms))

#include <usb_ops_linux.h>



void rtl8188eu_set_hw_type(struct adapter *padapter);