2020-10-17 18:28:52

by Martin Blumenstingl

Subject: [PATCH] usb: dwc2: Avoid leaving the error_debugfs label unused

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")
Reported-by: kernel test robot <[email protected]>
Reported-by: Jens Axboe <[email protected]>
Signed-off-by: Martin Blumenstingl <[email protected]>
---
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 e2820676beb1..5f18acac7406 100644
--- a/drivers/usb/dwc2/platform.c
+++ b/drivers/usb/dwc2/platform.c
@@ -608,10 +608,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_drd:
dwc2_drd_exit(hsotg);

--
2.28.0

2020-10-26 06:59:36

by Minas Harutyunyan

Subject: Re: [PATCH] usb: dwc2: Avoid leaving the error_debugfs label unused

On 10/17/2020 8:50 PM, Martin Blumenstingl wrote:
> 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")
> Reported-by: kernel test robot <[email protected]>
> Reported-by: Jens Axboe <[email protected]>
> Signed-off-by: Martin Blumenstingl <[email protected]>
> ---
> 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 e2820676beb1..5f18acac7406 100644
> --- a/drivers/usb/dwc2/platform.c
> +++ b/drivers/usb/dwc2/platform.c
> @@ -608,10 +608,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_drd:
> dwc2_drd_exit(hsotg);
>
>
Acked-by: Minas Harutyunyan <[email protected]>