* pick up "usb: dwc2: Avoid leaving the error_debugfs label unused"
@ 2020-11-19 22:23 Kamal Mostafa
2020-11-20 8:39 ` Greg KH
0 siblings, 1 reply; 5+ messages in thread
From: Kamal Mostafa @ 2020-11-19 22:23 UTC (permalink / raw)
To: Sasha Levin; +Cc: stable, Martin Blumenstingl
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: pick up "usb: dwc2: Avoid leaving the error_debugfs label unused"
2020-11-19 22:23 pick up "usb: dwc2: Avoid leaving the error_debugfs label unused" Kamal Mostafa
@ 2020-11-20 8:39 ` Greg KH
2020-11-20 16:46 ` Kamal Mostafa
2020-11-20 16:46 ` [PATCH 5.9.x] usb: dwc2: Avoid leaving the error_debugfs label unused Kamal Mostafa
0 siblings, 2 replies; 5+ messages in thread
From: Greg KH @ 2020-11-20 8:39 UTC (permalink / raw)
To: Kamal Mostafa; +Cc: Sasha Levin, stable, Martin Blumenstingl
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: pick up "usb: dwc2: Avoid leaving the error_debugfs label unused"
2020-11-20 8:39 ` Greg KH
@ 2020-11-20 16:46 ` Kamal Mostafa
2020-11-20 16:46 ` [PATCH 5.9.x] usb: dwc2: Avoid leaving the error_debugfs label unused Kamal Mostafa
1 sibling, 0 replies; 5+ messages in thread
From: Kamal Mostafa @ 2020-11-20 16:46 UTC (permalink / raw)
To: Greg KH; +Cc: Sasha Levin, stable, Martin Blumenstingl
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.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?
>
It is needed for 5.9 -- backport on the way.
Thanks,
-Kamal
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 5.9.x] usb: dwc2: Avoid leaving the error_debugfs label unused
2020-11-20 8:39 ` Greg KH
2020-11-20 16:46 ` Kamal Mostafa
@ 2020-11-20 16:46 ` Kamal Mostafa
2020-11-22 17:28 ` Sasha Levin
1 sibling, 1 reply; 5+ messages in thread
From: Kamal Mostafa @ 2020-11-20 16:46 UTC (permalink / raw)
To: Greg KH
Cc: Martin Blumenstingl, Sasha Levin, stable, Felipe Balbi, Kamal Mostafa
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);
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 5.9.x] usb: dwc2: Avoid leaving the error_debugfs label unused
2020-11-20 16:46 ` [PATCH 5.9.x] usb: dwc2: Avoid leaving the error_debugfs label unused Kamal Mostafa
@ 2020-11-22 17:28 ` Sasha Levin
0 siblings, 0 replies; 5+ messages in thread
From: Sasha Levin @ 2020-11-22 17:28 UTC (permalink / raw)
To: Kamal Mostafa; +Cc: Greg KH, Martin Blumenstingl, stable, Felipe Balbi
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!
--
Thanks,
Sasha
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-11-22 17:28 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-19 22:23 pick up "usb: dwc2: Avoid leaving the error_debugfs label unused" Kamal Mostafa
2020-11-20 8:39 ` Greg KH
2020-11-20 16:46 ` Kamal Mostafa
2020-11-20 16:46 ` [PATCH 5.9.x] usb: dwc2: Avoid leaving the error_debugfs label unused Kamal Mostafa
2020-11-22 17:28 ` Sasha Levin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).