]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
usb: chipidea/ci_hdrc_imx: Convert to platform remove callback returning void
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Wed, 17 May 2023 23:01:07 +0000 (01:01 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 21 Feb 2025 12:49:35 +0000 (13:49 +0100)
[ Upstream commit ad593ed671feb49e93a77653886c042f68b6cdfd ]

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@pengutronix.de>
Link: https://lore.kernel.org/r/20230517230239.187727-6-u.kleine-koenig@pengutronix.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Stable-dep-of: 74adad500346 ("usb: chipidea: ci_hdrc_imx: decrement device's refcount in .remove() and in the error path of .probe()")
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/usb/chipidea/ci_hdrc_imx.c

index 984087bbf3e2b1475168a89281d669eb22bb3f4d..362dcb2374bb7d9b5ff4af7a8f14260cbb883929 100644 (file)
@@ -507,7 +507,7 @@ disable_hsic_regulator:
        return ret;
 }
 
-static int ci_hdrc_imx_remove(struct platform_device *pdev)
+static void ci_hdrc_imx_remove(struct platform_device *pdev)
 {
        struct ci_hdrc_imx_data *data = platform_get_drvdata(pdev);
 
@@ -527,8 +527,6 @@ static int ci_hdrc_imx_remove(struct platform_device *pdev)
                if (data->hsic_pad_regulator)
                        regulator_disable(data->hsic_pad_regulator);
        }
-
-       return 0;
 }
 
 static void ci_hdrc_imx_shutdown(struct platform_device *pdev)
@@ -674,7 +672,7 @@ static const struct dev_pm_ops ci_hdrc_imx_pm_ops = {
 };
 static struct platform_driver ci_hdrc_imx_driver = {
        .probe = ci_hdrc_imx_probe,
-       .remove = ci_hdrc_imx_remove,
+       .remove_new = ci_hdrc_imx_remove,
        .shutdown = ci_hdrc_imx_shutdown,
        .driver = {
                .name = "imx_usb",