From 866525fd9f381e9ab6dbc453ec1aec65a28d6571 Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Mon, 19 Jul 2021 19:57:22 +0800 Subject: [PATCH] usb: gadget: transfer_type depends on CONFIG_NO_GKI 'struct dwc3_ep at core.h:704:1' changed (indirectly): type size changed from 1792 to 1856 (in bits) there are data member changes: type 'struct usb_ep' of 'dwc3_ep::endpoint' changed: type size changed from 576 to 640 (in bits) 1 data member insertion: 'u8 transfer_type', at offset 576 (in bits) at gadget.h:246:1 93 impacted interfaces 21 ('list_head cancelled_list' .. 'u64 android_kabi_reserved2') offsets changed (by +64 bits) 2 impacted interfaces Fixes: bcf7606d6111 ("usb: gadget: add transfer_type in struct usb_ep for rockchip") Signed-off-by: Tao Huang Change-Id: If7b276a054a18e6f49e59def6a4edf5ce4f3b694 --- 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 be3a7f2e5c17..177645f3250a 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; -#ifdef CONFIG_ARCH_ROCKCHIP +#if defined(CONFIG_ARCH_ROCKCHIP) && defined(CONFIG_NO_GKI) 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; -#ifdef CONFIG_ARCH_ROCKCHIP +#if defined(CONFIG_ARCH_ROCKCHIP) && defined(CONFIG_NO_GKI) 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 2711181c0092..e0ba1f0c13e6 100644 --- a/include/linux/usb/gadget.h +++ b/include/linux/usb/gadget.h @@ -242,7 +242,7 @@ struct usb_ep { u8 address; const struct usb_endpoint_descriptor *desc; const struct usb_ss_ep_comp_descriptor *comp_desc; -#ifdef CONFIG_ARCH_ROCKCHIP +#if defined(CONFIG_ARCH_ROCKCHIP) && defined(CONFIG_NO_GKI) u8 transfer_type; #endif };