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

diff --git a/drivers/clk/hisilicon/clk-hi3519.c b/drivers/clk/hisilicon/clk-hi3519.c
index ad0c7f350cf0314845edff48b053accd0a187b3b..b871872d9960db03e1493bbc64d5b1499f0f6367 100644 (file)
--- a/drivers/clk/hisilicon/clk-hi3519.c
+++ b/drivers/clk/hisilicon/clk-hi3519.c
@@ -162,13 +162,12 @@ static int hi3519_clk_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int hi3519_clk_remove(struct platform_device *pdev)
+static void hi3519_clk_remove(struct platform_device *pdev)
 {
        struct hi3519_crg_data *crg = platform_get_drvdata(pdev);
 
        hisi_reset_exit(crg->rstc);
        hi3519_clk_unregister(pdev);
-       return 0;
 }
 
 
@@ -180,7 +179,7 @@ MODULE_DEVICE_TABLE(of, hi3519_clk_match_table);
 
 static struct platform_driver hi3519_clk_driver = {
        .probe          = hi3519_clk_probe,
-       .remove         = hi3519_clk_remove,
+       .remove_new     = hi3519_clk_remove,
        .driver         = {
                .name   = "hi3519-clk",
                .of_match_table = hi3519_clk_match_table,

diff --git a/drivers/clk/hisilicon/clk-hi3559a.c b/drivers/clk/hisilicon/clk-hi3559a.c
index 9ea1a80acbe8b5be6475d2f729e5609c0a61d3a9..4f97638809b7b6fab648343ee439f879bdbf24f7 100644 (file)
--- a/drivers/clk/hisilicon/clk-hi3559a.c
+++ b/drivers/clk/hisilicon/clk-hi3559a.c
@@ -810,18 +810,17 @@ static int hi3559av100_crg_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int hi3559av100_crg_remove(struct platform_device *pdev)
+static void hi3559av100_crg_remove(struct platform_device *pdev)
 {
        struct hisi_crg_dev *crg = platform_get_drvdata(pdev);
 
        hisi_reset_exit(crg->rstc);
        crg->funcs->unregister_clks(pdev);
-       return 0;
 }
 
 static struct platform_driver hi3559av100_crg_driver = {
        .probe          = hi3559av100_crg_probe,
-       .remove         = hi3559av100_crg_remove,
+       .remove_new     = hi3559av100_crg_remove,
        .driver         = {
                .name   = "hi3559av100-clock",
                .of_match_table = hi3559av100_crg_match_table,

diff --git a/drivers/clk/hisilicon/crg-hi3516cv300.c b/drivers/clk/hisilicon/crg-hi3516cv300.c
index 5d4e61c7a42952a1895e740ab304db7a934946c8..fe1bd3e3f98841324318f2a489f2ba5dbf5a78dc 100644 (file)
--- a/drivers/clk/hisilicon/crg-hi3516cv300.c
+++ b/drivers/clk/hisilicon/crg-hi3516cv300.c
@@ -284,18 +284,17 @@ static int hi3516cv300_crg_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int hi3516cv300_crg_remove(struct platform_device *pdev)
+static void hi3516cv300_crg_remove(struct platform_device *pdev)
 {
        struct hisi_crg_dev *crg = platform_get_drvdata(pdev);
 
        hisi_reset_exit(crg->rstc);
        crg->funcs->unregister_clks(pdev);
-       return 0;
 }
 
 static struct platform_driver hi3516cv300_crg_driver = {
        .probe          = hi3516cv300_crg_probe,
-       .remove         = hi3516cv300_crg_remove,
+       .remove_new     = hi3516cv300_crg_remove,
        .driver         = {
                .name   = "hi3516cv300-crg",
                .of_match_table = hi3516cv300_crg_match_table,

diff --git a/drivers/clk/hisilicon/crg-hi3798cv200.c b/drivers/clk/hisilicon/crg-hi3798cv200.c
index 08a19ba776e62efe3dd421a8733fef9fb1007652..a0b16be1e25d9166808b238af3772376eea5e009 100644 (file)
--- a/drivers/clk/hisilicon/crg-hi3798cv200.c
+++ b/drivers/clk/hisilicon/crg-hi3798cv200.c
@@ -367,18 +367,17 @@ static int hi3798cv200_crg_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int hi3798cv200_crg_remove(struct platform_device *pdev)
+static void hi3798cv200_crg_remove(struct platform_device *pdev)
 {
        struct hisi_crg_dev *crg = platform_get_drvdata(pdev);
 
        hisi_reset_exit(crg->rstc);
        crg->funcs->unregister_clks(pdev);
-       return 0;
 }
 
 static struct platform_driver hi3798cv200_crg_driver = {
        .probe          = hi3798cv200_crg_probe,
-       .remove         = hi3798cv200_crg_remove,
+       .remove_new     = hi3798cv200_crg_remove,
        .driver         = {
                .name   = "hi3798cv200-crg",
                .of_match_table = hi3798cv200_crg_match_table,