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@xxxxxxxxxxxxxx>
> ---
> drivers/usb/host/ohci-st.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/usb/host/ohci-st.c b/drivers/usb/host/ohci-st.c
> index 82eef3c62e11..884e447a8098 100644
> --- a/drivers/usb/host/ohci-st.c
> +++ b/drivers/usb/host/ohci-st.c
> @@ -233,7 +233,7 @@ static int st_ohci_platform_probe(struct platform_device *dev)
> return err;
> }
>
> -static int st_ohci_platform_remove(struct platform_device *dev)
> +static void st_ohci_platform_remove(struct platform_device *dev)
> {
> struct usb_hcd *hcd = platform_get_drvdata(dev);
> struct usb_ohci_pdata *pdata = dev_get_platdata(&dev->dev);
> @@ -253,8 +253,6 @@ static int st_ohci_platform_remove(struct platform_device *dev)
>
> if (pdata == &ohci_platform_defaults)
> dev->dev.platform_data = NULL;
> -
> - return 0;
> }
>
> #ifdef CONFIG_PM_SLEEP
> @@ -306,7 +304,7 @@ MODULE_DEVICE_TABLE(of, st_ohci_platform_ids);
>
> static struct platform_driver ohci_platform_driver = {
> .probe = st_ohci_platform_probe,
> - .remove = st_ohci_platform_remove,
> + .remove_new = st_ohci_platform_remove,
> .shutdown = usb_hcd_platform_shutdown,
> .driver = {
> .name = "st-ohci",
Reviewed-by: Patrice Chotard <patrice.chotard@xxxxxxxxxxx>
Thanks
Patrice
