drop queue-4.14/usb-dwc2-fix-build-in-periphal-only-mode.patch

shouldn't have been there...

diff --git a/queue-4.14/series b/queue-4.14/series
index 6f8c46d8cad8e520530fef34ddbfe8d4d578e93e..1019954944acd95721806ccf00d016b5eea24430 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -22,4 +22,3 @@ pid-take-a-reference-when-initializing-cad_pid.patch
 ocfs2-fix-data-corruption-by-fallocate.patch
 nfc-fix-null-ptr-dereference-in-llcp_sock_getname-after-failed-connect.patch
 btrfs-fix-error-handling-in-btrfs_del_csums.patch
-usb-dwc2-fix-build-in-periphal-only-mode.patch

diff --git a/queue-4.14/usb-dwc2-fix-build-in-periphal-only-mode.patch b/queue-4.14/usb-dwc2-fix-build-in-periphal-only-mode.patch
deleted file mode 100644 (file)
index 502a41f..0000000
--- a/queue-4.14/usb-dwc2-fix-build-in-periphal-only-mode.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From phil@raspberrypi.com  Tue Jun  8 15:06:41 2021
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue,  8 Jun 2021 13:00:49 +0100
-Subject: usb: dwc2: Fix build in periphal-only mode
-To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org
-Cc: Phil Elwell <phil@raspberrypi.com>
-Message-ID: <20210608120049.1393123-1-phil@raspberrypi.com>
-
-From: Phil Elwell <phil@raspberrypi.com>
-
-In branches to which 24d209dba5a3 ("usb: dwc2: Fix hibernation between
-host and device modes.") has been back-ported, the bus_suspended member
-of struct dwc2_hsotg is only present in builds that support host-mode.
-To avoid having to pull in several more non-Fix commits in order to
-get it to compile, wrap the usage of the member in a macro conditional.
-
-Fixes: 24d209dba5a3 ("usb: dwc2: Fix hibernation between host and device modes.")
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
---- a/drivers/usb/dwc2/core_intr.c
-+++ b/drivers/usb/dwc2/core_intr.c
-@@ -725,7 +725,11 @@ static inline void dwc_handle_gpwrdn_disc_det(struct dwc2_hsotg *hsotg,
-       dwc2_writel(hsotg, gpwrdn_tmp, GPWRDN);
- 
-       hsotg->hibernated = 0;
-+
-+#if IS_ENABLED(CONFIG_USB_DWC2_HOST) ||       \
-+      IS_ENABLED(CONFIG_USB_DWC2_DUAL_ROLE)
-       hsotg->bus_suspended = 0;
-+#endif
- 
-       if (gpwrdn & GPWRDN_IDSTS) {
-               hsotg->op_state = OTG_STATE_B_PERIPHERAL;
--- 
-2.25.1
-