clk: bcm: 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-6-u.kleine-koenig@pengutronix.de
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

diff --git a/drivers/clk/bcm/clk-bcm2711-dvp.c b/drivers/clk/bcm/clk-bcm2711-dvp.c
index e63a42618ac2cd7e3657ce84770f91b7e5e1b036..e4fbbf3c40fe2b1a3175a089f2f08642340824a3 100644 (file)
--- a/drivers/clk/bcm/clk-bcm2711-dvp.c
+++ b/drivers/clk/bcm/clk-bcm2711-dvp.c
@@ -92,15 +92,13 @@ unregister_clk0:
        return ret;
 };
 
-static int clk_dvp_remove(struct platform_device *pdev)
+static void clk_dvp_remove(struct platform_device *pdev)
 {
        struct clk_dvp *dvp = platform_get_drvdata(pdev);
        struct clk_hw_onecell_data *data = dvp->data;
 
        clk_hw_unregister_gate(data->hws[1]);
        clk_hw_unregister_gate(data->hws[0]);
-
-       return 0;
 }
 
 static const struct of_device_id clk_dvp_dt_ids[] = {
@@ -111,7 +109,7 @@ MODULE_DEVICE_TABLE(of, clk_dvp_dt_ids);
 
 static struct platform_driver clk_dvp_driver = {
        .probe  = clk_dvp_probe,
-       .remove = clk_dvp_remove,
+       .remove_new = clk_dvp_remove,
        .driver = {
                .name           = "brcm2711-dvp",
                .of_match_table = clk_dvp_dt_ids,

diff --git a/drivers/clk/bcm/clk-bcm63xx-gate.c b/drivers/clk/bcm/clk-bcm63xx-gate.c
index 89297c57881e224c4e40273d894cfa7e8b2b43ec..0769f98767da6a1c33d7494d0a9b1d7f775f77d1 100644 (file)
--- a/drivers/clk/bcm/clk-bcm63xx-gate.c
+++ b/drivers/clk/bcm/clk-bcm63xx-gate.c
@@ -541,7 +541,7 @@ out_err:
        return ret;
 }
 
-static int clk_bcm63xx_remove(struct platform_device *pdev)
+static void clk_bcm63xx_remove(struct platform_device *pdev)
 {
        struct clk_bcm63xx_hw *hw = platform_get_drvdata(pdev);
        int i;
@@ -552,8 +552,6 @@ static int clk_bcm63xx_remove(struct platform_device *pdev)
                if (!IS_ERR(hw->data.hws[i]))
                        clk_hw_unregister_gate(hw->data.hws[i]);
        }
-
-       return 0;
 }
 
 static const struct of_device_id clk_bcm63xx_dt_ids[] = {
@@ -570,7 +568,7 @@ static const struct of_device_id clk_bcm63xx_dt_ids[] = {
 
 static struct platform_driver clk_bcm63xx = {
        .probe = clk_bcm63xx_probe,
-       .remove = clk_bcm63xx_remove,
+       .remove_new = clk_bcm63xx_remove,
        .driver = {
                .name = "bcm63xx-clock",
                .of_match_table = clk_bcm63xx_dt_ids,

diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
index ce2f9347973697eaaa7a672633e987f4f3fc4cfa..eb399a4d141ba24b5656064b3799765666acad7c 100644 (file)
--- a/drivers/clk/bcm/clk-raspberrypi.c
+++ b/drivers/clk/bcm/clk-raspberrypi.c
@@ -439,13 +439,11 @@ static int raspberrypi_clk_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int raspberrypi_clk_remove(struct platform_device *pdev)
+static void raspberrypi_clk_remove(struct platform_device *pdev)
 {
        struct raspberrypi_clk *rpi = platform_get_drvdata(pdev);
 
        platform_device_unregister(rpi->cpufreq);
-
-       return 0;
 }
 
 static const struct of_device_id raspberrypi_clk_match[] = {
@@ -460,7 +458,7 @@ static struct platform_driver raspberrypi_clk_driver = {
                .of_match_table = raspberrypi_clk_match,
        },
        .probe          = raspberrypi_clk_probe,
-       .remove         = raspberrypi_clk_remove,
+       .remove_new     = raspberrypi_clk_remove,
 };
 module_platform_driver(raspberrypi_clk_driver);