qjyu
/
OrangePi_CM5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "usb: gadget: add transfer_type in struct usb_ep for rockchip" 

This reverts commit bcf7606d61.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: Ic493a5f24217b728925ec71a5e47b0a3534de764
This commit is contained in:
William Wu 2023-01-29 20:34:38 +08:00 committed by Tao Huang
parent da52789497
commit f658eb3ee6
2 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/usb/gadget/epautoconf.c
View File

@ -67,9 +67,6 @@ struct usb_ep *usb_ep_autoconfig_ss(
)
{
struct usb_ep *ep;
#ifdef CONFIG_ARCH_ROCKCHIP
u8 type = desc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK;
#endif
if (gadget->ops->match_ep) {
ep = gadget->ops->match_ep(gadget, desc, ep_comp);
@ -113,27 +110,6 @@ found_ep:
ep->desc = NULL;
ep->comp_desc = NULL;
ep->claimed = true;
#ifdef CONFIG_ARCH_ROCKCHIP
ep->transfer_type = type;
if (gadget_is_superspeed(gadget) && ep_comp) {
switch (type) {
case USB_ENDPOINT_XFER_ISOC:
/* mult: bits 1:0 of bmAttributes */
ep->mult = (ep_comp->bmAttributes & 0x3) + 1;
fallthrough;
case USB_ENDPOINT_XFER_BULK:
case USB_ENDPOINT_XFER_INT:
ep->maxburst = ep_comp->bMaxBurst + 1;
break;
default:
break;
}
} else if (gadget_is_dualspeed(gadget) &&
(type == USB_ENDPOINT_XFER_ISOC ||
type == USB_ENDPOINT_XFER_INT)) {
ep->mult = usb_endpoint_maxp_mult(desc);
}
#endif
return ep;
}
EXPORT_SYMBOL_GPL(usb_ep_autoconfig_ss);

4
include/linux/usb/gadget.h
View File

@ -222,7 +222,6 @@ struct usb_ep_caps {
* enabled and remains valid until the endpoint is disabled.
* @comp_desc: In case of SuperSpeed support, this is the endpoint companion
* descriptor that is used to configure the endpoint
* @transfer_type: Used to specify transfer type of EP.
*
* the bus controller driver lists all the general purpose endpoints in
* gadget->ep_list. the control endpoint (gadget->ep0) is not in that list,
@ -246,9 +245,6 @@ struct usb_ep {
u8 address;
const struct usb_endpoint_descriptor *desc;
const struct usb_ss_ep_comp_descriptor *comp_desc;
#ifdef CONFIG_ARCH_ROCKCHIP
u8 transfer_type;
#endif
ANDROID_KABI_RESERVE(1);
};