[PATCH 54/97] usb: ehci-platform: Convert to platform remove callback returning void

Yoshihiro Shimoda yoshihiro.shimoda.uh at renesas.com
Thu May 18 01:48:48 PDT 2023


Hi Uwe,

> From: Uwe Kleine-König, Sent: Thursday, May 18, 2023 8:02 AM
> 
> The .remove() callback for a platform driver returns an int which makes
> many driver authors wrongly assume it's possible to do error handling by
> returning an error code. However the value returned is ignored (apart from
> emitting a warning) and this typically results in resource leaks. To improve
> here there is a quest to make the remove callback return void. In the first
> step of this quest all drivers are converted to .remove_new() which already
> returns void. Eventually after all drivers are converted, .remove_new() is
> renamed to .remove().
> 
> Trivially convert this driver from always returning zero in the remove
> callback to the void returning variant.
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig at pengutronix.de>

Thank you for the patch!

Reviewed-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh at renesas.com>

Best regards,
Yoshihiro Shimoda

> ---
>  drivers/usb/host/ehci-platform.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c
> index fe497c876d76..83bf56c9424f 100644
> --- a/drivers/usb/host/ehci-platform.c
> +++ b/drivers/usb/host/ehci-platform.c
> @@ -400,7 +400,7 @@ static int ehci_platform_probe(struct platform_device *dev)
>  	return err;
>  }
> 
> -static int ehci_platform_remove(struct platform_device *dev)
> +static void ehci_platform_remove(struct platform_device *dev)
>  {
>  	struct usb_hcd *hcd = platform_get_drvdata(dev);
>  	struct usb_ehci_pdata *pdata = dev_get_platdata(&dev->dev);
> @@ -424,8 +424,6 @@ static int ehci_platform_remove(struct platform_device *dev)
> 
>  	if (pdata == &ehci_platform_defaults)
>  		dev->dev.platform_data = NULL;
> -
> -	return 0;
>  }
> 
>  static int __maybe_unused ehci_platform_suspend(struct device *dev)
> @@ -511,7 +509,7 @@ static SIMPLE_DEV_PM_OPS(ehci_platform_pm_ops, ehci_platform_suspend,
>  static struct platform_driver ehci_platform_driver = {
>  	.id_table	= ehci_platform_table,
>  	.probe		= ehci_platform_probe,
> -	.remove		= ehci_platform_remove,
> +	.remove_new	= ehci_platform_remove,
>  	.shutdown	= usb_hcd_platform_shutdown,
>  	.driver		= {
>  		.name	= "ehci-platform",
> --
> 2.39.2



More information about the linux-arm-kernel mailing list