]> git.itanic.dy.fi Git - linux-stable/commitdiff
fpga: socfpga-a10: Convert to platform remove callback returning void
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Tue, 19 Dec 2023 17:32:08 +0000 (18:32 +0100)
committerXu Yilun <yilun.xu@linux.intel.com>
Thu, 21 Dec 2023 14:33:15 +0000 (22:33 +0800)
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() will be 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>
Acked-by: Xu Yilun <yilun.xu@intel.com>
Link: https://lore.kernel.org/r/da701d72522dde185becc15096342786a3a12153.1703006638.git.u.kleine-koenig@pengutronix.de
Signed-off-by: Xu Yilun <yilun.xu@linux.intel.com>
drivers/fpga/socfpga-a10.c

index cc4861e345c935ed27a128498d02eccdd0d343da..4c03513b8f03b5c9c6140abea34b4be650f790ea 100644 (file)
@@ -517,15 +517,13 @@ static int socfpga_a10_fpga_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int socfpga_a10_fpga_remove(struct platform_device *pdev)
+static void socfpga_a10_fpga_remove(struct platform_device *pdev)
 {
        struct fpga_manager *mgr = platform_get_drvdata(pdev);
        struct a10_fpga_priv *priv = mgr->priv;
 
        fpga_mgr_unregister(mgr);
        clk_disable_unprepare(priv->clk);
-
-       return 0;
 }
 
 static const struct of_device_id socfpga_a10_fpga_of_match[] = {
@@ -537,7 +535,7 @@ MODULE_DEVICE_TABLE(of, socfpga_a10_fpga_of_match);
 
 static struct platform_driver socfpga_a10_fpga_driver = {
        .probe = socfpga_a10_fpga_probe,
-       .remove = socfpga_a10_fpga_remove,
+       .remove_new = socfpga_a10_fpga_remove,
        .driver = {
                .name   = "socfpga_a10_fpga_manager",
                .of_match_table = socfpga_a10_fpga_of_match,