Commit bfa8370b authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Stephen Boyd

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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20230312161512.2715500-18-u.kleine-koenig@pengutronix.deSigned-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 8ad00c14
...@@ -162,13 +162,12 @@ static int hi3519_clk_probe(struct platform_device *pdev) ...@@ -162,13 +162,12 @@ static int hi3519_clk_probe(struct platform_device *pdev)
return 0; 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); struct hi3519_crg_data *crg = platform_get_drvdata(pdev);
hisi_reset_exit(crg->rstc); hisi_reset_exit(crg->rstc);
hi3519_clk_unregister(pdev); hi3519_clk_unregister(pdev);
return 0;
} }
...@@ -180,7 +179,7 @@ MODULE_DEVICE_TABLE(of, hi3519_clk_match_table); ...@@ -180,7 +179,7 @@ MODULE_DEVICE_TABLE(of, hi3519_clk_match_table);
static struct platform_driver hi3519_clk_driver = { static struct platform_driver hi3519_clk_driver = {
.probe = hi3519_clk_probe, .probe = hi3519_clk_probe,
.remove = hi3519_clk_remove, .remove_new = hi3519_clk_remove,
.driver = { .driver = {
.name = "hi3519-clk", .name = "hi3519-clk",
.of_match_table = hi3519_clk_match_table, .of_match_table = hi3519_clk_match_table,
......
...@@ -810,18 +810,17 @@ static int hi3559av100_crg_probe(struct platform_device *pdev) ...@@ -810,18 +810,17 @@ static int hi3559av100_crg_probe(struct platform_device *pdev)
return 0; 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); struct hisi_crg_dev *crg = platform_get_drvdata(pdev);
hisi_reset_exit(crg->rstc); hisi_reset_exit(crg->rstc);
crg->funcs->unregister_clks(pdev); crg->funcs->unregister_clks(pdev);
return 0;
} }
static struct platform_driver hi3559av100_crg_driver = { static struct platform_driver hi3559av100_crg_driver = {
.probe = hi3559av100_crg_probe, .probe = hi3559av100_crg_probe,
.remove = hi3559av100_crg_remove, .remove_new = hi3559av100_crg_remove,
.driver = { .driver = {
.name = "hi3559av100-clock", .name = "hi3559av100-clock",
.of_match_table = hi3559av100_crg_match_table, .of_match_table = hi3559av100_crg_match_table,
......
...@@ -284,18 +284,17 @@ static int hi3516cv300_crg_probe(struct platform_device *pdev) ...@@ -284,18 +284,17 @@ static int hi3516cv300_crg_probe(struct platform_device *pdev)
return 0; 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); struct hisi_crg_dev *crg = platform_get_drvdata(pdev);
hisi_reset_exit(crg->rstc); hisi_reset_exit(crg->rstc);
crg->funcs->unregister_clks(pdev); crg->funcs->unregister_clks(pdev);
return 0;
} }
static struct platform_driver hi3516cv300_crg_driver = { static struct platform_driver hi3516cv300_crg_driver = {
.probe = hi3516cv300_crg_probe, .probe = hi3516cv300_crg_probe,
.remove = hi3516cv300_crg_remove, .remove_new = hi3516cv300_crg_remove,
.driver = { .driver = {
.name = "hi3516cv300-crg", .name = "hi3516cv300-crg",
.of_match_table = hi3516cv300_crg_match_table, .of_match_table = hi3516cv300_crg_match_table,
......
...@@ -367,18 +367,17 @@ static int hi3798cv200_crg_probe(struct platform_device *pdev) ...@@ -367,18 +367,17 @@ static int hi3798cv200_crg_probe(struct platform_device *pdev)
return 0; 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); struct hisi_crg_dev *crg = platform_get_drvdata(pdev);
hisi_reset_exit(crg->rstc); hisi_reset_exit(crg->rstc);
crg->funcs->unregister_clks(pdev); crg->funcs->unregister_clks(pdev);
return 0;
} }
static struct platform_driver hi3798cv200_crg_driver = { static struct platform_driver hi3798cv200_crg_driver = {
.probe = hi3798cv200_crg_probe, .probe = hi3798cv200_crg_probe,
.remove = hi3798cv200_crg_remove, .remove_new = hi3798cv200_crg_remove,
.driver = { .driver = {
.name = "hi3798cv200-crg", .name = "hi3798cv200-crg",
.of_match_table = hi3798cv200_crg_match_table, .of_match_table = hi3798cv200_crg_match_table,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment