staging: rtl8723au: Remove unused USB bulk related macros and variables

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_halinit.c b/drivers/staging/rtl8723au/hal/usb_halinit.c
index ccc57fddd78030c82b3c2f360f7ef5cdeee805d3..9ef333c031e28ab0da56904b96f0ddc343af5606 100644 (file)
--- a/drivers/staging/rtl8723au/hal/usb_halinit.c
+++ b/drivers/staging/rtl8723au/hal/usb_halinit.c
@@ -85,14 +85,6 @@ void rtl8723au_chip_configure(struct rtw_adapter *padapter)
        struct hal_data_8723a *pHalData = GET_HAL_DATA(padapter);
        struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter);
 
-       if (pdvobjpriv->ishighspeed == true) {
-               /* 512 bytes */
-               pHalData->UsbBulkOutSize = USB_HIGH_SPEED_BULK_SIZE;
-       } else {
-               /* 64 bytes */
-               pHalData->UsbBulkOutSize = USB_FULL_SPEED_BULK_SIZE;
-       }
-
        pHalData->interfaceIndex = pdvobjpriv->InterfaceNumber;
 
        rtl8723au_set_queue_pipe_mapping(padapter,

diff --git a/drivers/staging/rtl8723au/include/rtl8723a_hal.h b/drivers/staging/rtl8723au/include/rtl8723a_hal.h
index c22bb811aa01d83852f86c212847d5ff7d4d793c..1aa65e067209aff56c45b85e8e3b100d0207bda2 100644 (file)
--- a/drivers/staging/rtl8723au/include/rtl8723a_hal.h
+++ b/drivers/staging/rtl8723au/include/rtl8723a_hal.h
@@ -413,11 +413,6 @@ struct hal_data_8723a {
 
        bool                            bMACFuncEnable;
 
-       /*  */
-       /*  For USB Interface HAL related */
-       /*  */
-       u32     UsbBulkOutSize;
-
        /*  Interrupt related register information. */
        u32     IntArray[2];
        u32     IntrMask[2];

diff --git a/drivers/staging/rtl8723au/include/usb_ops.h b/drivers/staging/rtl8723au/include/usb_ops.h
index be75c9f1644424722e66c04e2c0ac18ed8dbf140..977805d97b346451df46b50545d3b0baf5409c4c 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_bulk_msg(usb_dev, pipe, data, len, actual_length, timeout_ms) \
-       usb_bulk_msg((usb_dev), (pipe), (data), (len), (actual_length), \
-                    (timeout_ms))
-
 void rtl8723au_set_hw_type(struct rtw_adapter *padapter);
 
 void rtl8723au_set_intf_ops(struct rtw_adapter *padapter);
@@ -69,24 +65,6 @@ static inline void rtw_reset_continual_urb_error(struct dvobj_priv *dvobj)
        atomic_set(&dvobj->continual_urb_error, 0);
 }
 
-#define USB_HIGH_SPEED_BULK_SIZE       512
-#define USB_FULL_SPEED_BULK_SIZE       64
-
-static inline u8 rtw_usb_bulk_size_boundary(struct rtw_adapter *padapter,
-                                           int buf_len)
-{
-       u8 rst = true;
-       struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter);
-
-       if (pdvobjpriv->ishighspeed)
-               rst = (0 == (buf_len) % USB_HIGH_SPEED_BULK_SIZE) ?
-                     true : false;
-       else
-               rst = (0 == (buf_len) % USB_FULL_SPEED_BULK_SIZE) ?
-                     true : false;
-       return rst;
-}
-
 void rtl8723au_chip_configure(struct rtw_adapter *padapter);
 
 #endif /* __USB_OPS_H_ */