clk: xilinx: Convert to platform remove callback returning void

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 (mostly) ignored
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.

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/20230312161512.2715500-31-u.kleine-koenig@pengutronix.de
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

diff --git a/drivers/clk/xilinx/clk-xlnx-clock-wizard.c b/drivers/clk/xilinx/clk-xlnx-clock-wizard.c
index eb1dfe7ecc1b43edddc1db13ca5b32d99a58e97f..fa829c01a444fb9ccd515190b826c2ea3ffdda72 100644 (file)
--- a/drivers/clk/xilinx/clk-xlnx-clock-wizard.c
+++ b/drivers/clk/xilinx/clk-xlnx-clock-wizard.c
@@ -593,7 +593,7 @@ err_disable_clk:
        return ret;
 }
 
-static int clk_wzrd_remove(struct platform_device *pdev)
+static void clk_wzrd_remove(struct platform_device *pdev)
 {
        int i;
        struct clk_wzrd *clk_wzrd = platform_get_drvdata(pdev);
@@ -611,8 +611,6 @@ static int clk_wzrd_remove(struct platform_device *pdev)
        }
 
        clk_disable_unprepare(clk_wzrd->axi_clk);
-
-       return 0;
 }
 
 static const struct of_device_id clk_wzrd_ids[] = {
@@ -630,7 +628,7 @@ static struct platform_driver clk_wzrd_driver = {
                .pm = &clk_wzrd_dev_pm_ops,
        },
        .probe = clk_wzrd_probe,
-       .remove = clk_wzrd_remove,
+       .remove_new = clk_wzrd_remove,
 };
 module_platform_driver(clk_wzrd_driver);
 

diff --git a/drivers/clk/xilinx/xlnx_vcu.c b/drivers/clk/xilinx/xlnx_vcu.c
index 54b44debfd3e8b519fbaeafca82014a5f3c235f7..0786f15ebbe83fad65c4278b5685be5a4c1f0783 100644 (file)
--- a/drivers/clk/xilinx/xlnx_vcu.c
+++ b/drivers/clk/xilinx/xlnx_vcu.c
@@ -702,7 +702,7 @@ error_clk_provider:
  * Return:     Returns 0 on success
  *             Negative error code otherwise
  */
-static int xvcu_remove(struct platform_device *pdev)
+static void xvcu_remove(struct platform_device *pdev)
 {
        struct xvcu_device *xvcu;
 
@@ -714,8 +714,6 @@ static int xvcu_remove(struct platform_device *pdev)
        regmap_write(xvcu->logicore_reg_ba, VCU_GASKET_INIT, 0);
 
        clk_disable_unprepare(xvcu->aclk);
-
-       return 0;
 }
 
 static const struct of_device_id xvcu_of_id_table[] = {
@@ -731,7 +729,7 @@ static struct platform_driver xvcu_driver = {
                .of_match_table = xvcu_of_id_table,
        },
        .probe                  = xvcu_probe,
-       .remove                 = xvcu_remove,
+       .remove_new             = xvcu_remove,
 };
 
 module_platform_driver(xvcu_driver);