From 391716695e7131abfa7eff725185ab51b1d5d30b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 28 Sep 2022 13:24:43 +0200 Subject: [PATCH] Revert "usb: dwc3: gadget: Avoid starting DWC3 gadget during UDC unbind" This reverts commit b83692feb09c1817674839f5b0ad68e630f61e51 which is commit 8217f07a50236779880f13e87f99224cd9117f83 upstream. This is already in the tree as commit bb13ff05981f ("BACKPORT: FROMGIT: usb: dwc3: gadget: Avoid starting DWC3 gadget during UDC unbind") in a non-ABI-breaking way, so there's no need to include it in here again when it is not even really doing anything. Bug: 161946584 Bug: 200287549 Signed-off-by: Greg Kroah-Hartman Change-Id: I48b6b159fd00d0635336a556c0e0488571c2c09b --- drivers/usb/dwc3/core.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index b49462651263..28df4e8b9359 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -1044,7 +1044,6 @@ struct dwc3_scratchpad_array { * @tx_fifo_resize_max_num: max number of fifos allocated during txfifo resize * @hsphy_interface: "utmi" or "ulpi" * @connected: true when we're connected to a host, false otherwise - * @softconnect: true when gadget connect is called, false when disconnect runs * @delayed_status: true when gadget driver asks for delayed status * @ep0_bounced: true when we used bounce buffer * @ep0_expect_in: true when we expect a DATA IN transfer @@ -1265,7 +1264,6 @@ struct dwc3 { const char *hsphy_interface; unsigned connected:1; - unsigned softconnect:1; unsigned delayed_status:1; unsigned ep0_bounced:1; unsigned ep0_expect_in:1;