From da527894979496726f04ff82ab75ec5df29cb857 Mon Sep 17 00:00:00 2001 From: William Wu Date: Sun, 29 Jan 2023 20:30:23 +0800 Subject: [PATCH] Revert "usb: gadget: transfer_type depends on CONFIG_NO_GKI" This reverts commit 866525fd9f381e9ab6dbc453ec1aec65a28d6571. Signed-off-by: William Wu Change-Id: Iba893b9036a01bcdc981311a9846b2375e167c02 --- drivers/usb/gadget/epautoconf.c | 4 ++-- include/linux/usb/gadget.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/usb/gadget/epautoconf.c index 177645f3250a..be3a7f2e5c17 100644 --- a/drivers/usb/gadget/epautoconf.c +++ b/drivers/usb/gadget/epautoconf.c @@ -67,7 +67,7 @@ struct usb_ep *usb_ep_autoconfig_ss( ) { struct usb_ep *ep; -#if defined(CONFIG_ARCH_ROCKCHIP) && defined(CONFIG_NO_GKI) +#ifdef CONFIG_ARCH_ROCKCHIP u8 type = desc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK; #endif @@ -113,7 +113,7 @@ found_ep: ep->desc = NULL; ep->comp_desc = NULL; ep->claimed = true; -#if defined(CONFIG_ARCH_ROCKCHIP) && defined(CONFIG_NO_GKI) +#ifdef CONFIG_ARCH_ROCKCHIP ep->transfer_type = type; if (gadget_is_superspeed(gadget) && ep_comp) { switch (type) { diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h index e5cdba2db7b2..33b41448e246 100644 --- a/include/linux/usb/gadget.h +++ b/include/linux/usb/gadget.h @@ -246,7 +246,7 @@ struct usb_ep { u8 address; const struct usb_endpoint_descriptor *desc; const struct usb_ss_ep_comp_descriptor *comp_desc; -#if defined(CONFIG_ARCH_ROCKCHIP) && defined(CONFIG_NO_GKI) +#ifdef CONFIG_ARCH_ROCKCHIP u8 transfer_type; #endif