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

Patrice CHOTARD patrice.chotard at foss.st.com
Tue May 23 23:02:59 PDT 2023



On 5/18/23 01:02, Uwe Kleine-König wrote:
> 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>
> ---
>  drivers/usb/host/ehci-st.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/usb/host/ehci-st.c b/drivers/usb/host/ehci-st.c
> index f731dc98c533..ee0976b815b4 100644
> --- a/drivers/usb/host/ehci-st.c
> +++ b/drivers/usb/host/ehci-st.c
> @@ -252,7 +252,7 @@ static int st_ehci_platform_probe(struct platform_device *dev)
>  	return err;
>  }
>  
> -static int st_ehci_platform_remove(struct platform_device *dev)
> +static void st_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);
> @@ -271,8 +271,6 @@ static int st_ehci_platform_remove(struct platform_device *dev)
>  
>  	if (pdata == &ehci_platform_defaults)
>  		dev->dev.platform_data = NULL;
> -
> -	return 0;
>  }
>  
>  #ifdef CONFIG_PM_SLEEP
> @@ -328,7 +326,7 @@ MODULE_DEVICE_TABLE(of, st_ehci_ids);
>  
>  static struct platform_driver ehci_platform_driver = {
>  	.probe		= st_ehci_platform_probe,
> -	.remove		= st_ehci_platform_remove,
> +	.remove_new	= st_ehci_platform_remove,
>  	.shutdown	= usb_hcd_platform_shutdown,
>  	.driver		= {
>  		.name	= "st-ehci",

Reviewed-by: Patrice Chotard <patrice.chotard at foss.st.com>

Thanks
Patrice



More information about the linux-arm-kernel mailing list