Commit e88c9558 authored by Dmitry Antipov's avatar Dmitry Antipov Committed by Kalle Valo

wifi: rtw88: remove unused USB bulkout size set

Drop no longer used 'bulkout_size' of 'struct rtw_usb' as well
as related macros from usb.h and leftovers in 'rtw_usb_parse()'.
This follows commit 462c8db6 ("wifi: rtw88: usb: drop
now unnecessary URB size check").
Reviewed-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Reviewed-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarDmitry Antipov <dmantipov@yandex.ru>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230628072327.167196-3-dmantipov@yandex.ru
parent 6ca25a31
...@@ -142,7 +142,6 @@ static int rtw_usb_parse(struct rtw_dev *rtwdev, ...@@ -142,7 +142,6 @@ static int rtw_usb_parse(struct rtw_dev *rtwdev,
struct usb_host_interface *host_interface = &interface->altsetting[0]; struct usb_host_interface *host_interface = &interface->altsetting[0];
struct usb_interface_descriptor *interface_desc = &host_interface->desc; struct usb_interface_descriptor *interface_desc = &host_interface->desc;
struct usb_endpoint_descriptor *endpoint; struct usb_endpoint_descriptor *endpoint;
struct usb_device *usbd = interface_to_usbdev(interface);
int num_out_pipes = 0; int num_out_pipes = 0;
int i; int i;
u8 num; u8 num;
...@@ -184,22 +183,6 @@ static int rtw_usb_parse(struct rtw_dev *rtwdev, ...@@ -184,22 +183,6 @@ static int rtw_usb_parse(struct rtw_dev *rtwdev,
} }
} }
switch (usbd->speed) {
case USB_SPEED_LOW:
case USB_SPEED_FULL:
rtwusb->bulkout_size = RTW_USB_FULL_SPEED_BULK_SIZE;
break;
case USB_SPEED_HIGH:
rtwusb->bulkout_size = RTW_USB_HIGH_SPEED_BULK_SIZE;
break;
case USB_SPEED_SUPER:
rtwusb->bulkout_size = RTW_USB_SUPER_SPEED_BULK_SIZE;
break;
default:
rtw_err(rtwdev, "failed to detect usb speed\n");
return -EINVAL;
}
rtwdev->hci.bulkout_num = num_out_pipes; rtwdev->hci.bulkout_num = num_out_pipes;
if (num_out_pipes < 1 || num_out_pipes > 4) { if (num_out_pipes < 1 || num_out_pipes > 4) {
......
...@@ -18,10 +18,6 @@ ...@@ -18,10 +18,6 @@
#define RTW_USB_VENQT_CMD_IDX 0x00 #define RTW_USB_VENQT_CMD_IDX 0x00
#define RTW_USB_SUPER_SPEED_BULK_SIZE 1024
#define RTW_USB_HIGH_SPEED_BULK_SIZE 512
#define RTW_USB_FULL_SPEED_BULK_SIZE 64
#define RTW_USB_TX_SEL_HQ BIT(0) #define RTW_USB_TX_SEL_HQ BIT(0)
#define RTW_USB_TX_SEL_LQ BIT(1) #define RTW_USB_TX_SEL_LQ BIT(1)
#define RTW_USB_TX_SEL_NQ BIT(2) #define RTW_USB_TX_SEL_NQ BIT(2)
...@@ -73,7 +69,6 @@ struct rtw_usb { ...@@ -73,7 +69,6 @@ struct rtw_usb {
__le32 *usb_data; __le32 *usb_data;
unsigned int usb_data_index; unsigned int usb_data_index;
u32 bulkout_size;
u8 pipe_interrupt; u8 pipe_interrupt;
u8 pipe_in; u8 pipe_in;
u8 out_ep[RTW_USB_EP_MAX]; u8 out_ep[RTW_USB_EP_MAX];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment