staging: rtl8723au: Don't wrap calls to usb_control_msg()

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/hal/usb_ops_linux.c b/drivers/staging/rtl8723au/hal/usb_ops_linux.c
index be43863d1c2d7bf59e81ce20681eb245865cac36..e156377b681efd9bf50791f1c4c29ce1676cdd1b 100644 (file)
--- a/drivers/staging/rtl8723au/hal/usb_ops_linux.c
+++ b/drivers/staging/rtl8723au/hal/usb_ops_linux.c
@@ -73,9 +73,9 @@ static int usbctrl_vendorreq(struct rtw_adapter *padapter, u8 request,
                        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(pdvobjpriv);

diff --git a/drivers/staging/rtl8723au/include/usb_ops.h b/drivers/staging/rtl8723au/include/usb_ops.h
index a5fd432be9181793d78fcb6591667a900d6c8508..be75c9f1644424722e66c04e2c0ac18ed8dbf140 100644 (file)
--- a/drivers/staging/rtl8723au/include/usb_ops.h
+++ b/drivers/staging/rtl8723au/include/usb_ops.h
@@ -34,10 +34,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))
 #define rtw_usb_bulk_msg(usb_dev, pipe, data, len, actual_length, timeout_ms) \
        usb_bulk_msg((usb_dev), (pipe), (data), (len), (actual_length), \
                     (timeout_ms))