Hi Sasha-
To fix an unused-label warning, please pick up this mainline commit:
190bb01b72d2 ("usb: dwc2: Avoid leaving the error_debugfs label unused")
in these stable branches:
linux-5.8.y linux-5.9.y
For reference, the warning was introduced by the stable backports of [mainline] e1c08cf23172 ("usb: dwc2: Add missing cleanups when usb_add_gadget_udc() fails")
Thanks!
-Kamal
On Thu, Nov 19, 2020 at 02:23:42PM -0800, Kamal Mostafa wrote:
Hi Sasha-
To fix an unused-label warning, please pick up this mainline commit:
190bb01b72d2 ("usb: dwc2: Avoid leaving the error_debugfs label unused")
in these stable branches:
linux-5.8.y
5.8.y is long end-of-life, nothing I can do there.
linux-5.9.y
It does not apply cleanly to this kernel tree, are you sure it is needed there? If so, can you provide a working backport?
thanks,
greg k-h
On Fri, Nov 20, 2020 at 09:39:38AM +0100, Greg KH wrote:
On Thu, Nov 19, 2020 at 02:23:42PM -0800, Kamal Mostafa wrote:
Hi Sasha-
To fix an unused-label warning, please pick up this mainline commit:
190bb01b72d2 ("usb: dwc2: Avoid leaving the error_debugfs label unused")
in these stable branches:
linux-5.8.y5.8.y is long end-of-life, nothing I can do there.
linux-5.9.yIt does not apply cleanly to this kernel tree, are you sure it is needed there? If so, can you provide a working backport?
It is needed for 5.9 -- backport on the way.
Thanks,
-Kamal
From: Martin Blumenstingl martin.blumenstingl@googlemail.com
commit 190bb01b72d2d5c3654a03c42fb1ad0dc6114c79 upstream.
The error_debugfs label is only used when either CONFIG_USB_DWC2_PERIPHERAL or CONFIG_USB_DWC2_DUAL_ROLE is enabled. Add the same #if to the error_debugfs label itself as the code which uses this label already has.
This avoids the following compiler warning: warning: label ‘error_debugfs’ defined but not used [-Wunused-label]
Fixes: e1c08cf23172ed ("usb: dwc2: Add missing cleanups when usb_add_gadget_udc() fails") Acked-by: Minas Harutyunyan Minas.Harutyunyan@synopsys.com Reported-by: kernel test robot lkp@intel.com Reported-by: Jens Axboe axboe@kernel.dk Signed-off-by: Martin Blumenstingl martin.blumenstingl@googlemail.com Signed-off-by: Felipe Balbi balbi@kernel.org Cc: stable@vger.kernel.org # 5.9.x Signed-off-by: Kamal Mostafa kamal@canonical.com --- drivers/usb/dwc2/platform.c | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c index b28e90e0b685..8a7f86e1ef73 100644 --- a/drivers/usb/dwc2/platform.c +++ b/drivers/usb/dwc2/platform.c @@ -590,10 +590,13 @@ static int dwc2_driver_probe(struct platform_device *dev) #endif /* CONFIG_USB_DWC2_PERIPHERAL || CONFIG_USB_DWC2_DUAL_ROLE */ return 0;
+#if IS_ENABLED(CONFIG_USB_DWC2_PERIPHERAL) || \ + IS_ENABLED(CONFIG_USB_DWC2_DUAL_ROLE) error_debugfs: dwc2_debugfs_exit(hsotg); if (hsotg->hcd_enabled) dwc2_hcd_remove(hsotg); +#endif error_init: if (hsotg->params.activate_stm_id_vb_detection) regulator_disable(hsotg->usb33d);
On Fri, Nov 20, 2020 at 08:46:45AM -0800, Kamal Mostafa wrote:
From: Martin Blumenstingl martin.blumenstingl@googlemail.com
commit 190bb01b72d2d5c3654a03c42fb1ad0dc6114c79 upstream.
The error_debugfs label is only used when either CONFIG_USB_DWC2_PERIPHERAL or CONFIG_USB_DWC2_DUAL_ROLE is enabled. Add the same #if to the error_debugfs label itself as the code which uses this label already has.
This avoids the following compiler warning: warning: label ‘error_debugfs’ defined but not used [-Wunused-label]
Fixes: e1c08cf23172ed ("usb: dwc2: Add missing cleanups when usb_add_gadget_udc() fails") Acked-by: Minas Harutyunyan Minas.Harutyunyan@synopsys.com Reported-by: kernel test robot lkp@intel.com Reported-by: Jens Axboe axboe@kernel.dk Signed-off-by: Martin Blumenstingl martin.blumenstingl@googlemail.com Signed-off-by: Felipe Balbi balbi@kernel.org Cc: stable@vger.kernel.org # 5.9.x Signed-off-by: Kamal Mostafa kamal@canonical.com
Queued up, thanks!
linux-stable-mirror@lists.linaro.org
-
Greg KH -
Kamal Mostafa -
Sasha Levin