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

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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20230312161512.2715500-31-u.kleine-koenig@pengutronix.deSigned-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 4690d246
...@@ -593,7 +593,7 @@ static int clk_wzrd_probe(struct platform_device *pdev) ...@@ -593,7 +593,7 @@ static int clk_wzrd_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int clk_wzrd_remove(struct platform_device *pdev) static void clk_wzrd_remove(struct platform_device *pdev)
{ {
int i; int i;
struct clk_wzrd *clk_wzrd = platform_get_drvdata(pdev); struct clk_wzrd *clk_wzrd = platform_get_drvdata(pdev);
...@@ -611,8 +611,6 @@ static int clk_wzrd_remove(struct platform_device *pdev) ...@@ -611,8 +611,6 @@ static int clk_wzrd_remove(struct platform_device *pdev)
} }
clk_disable_unprepare(clk_wzrd->axi_clk); clk_disable_unprepare(clk_wzrd->axi_clk);
return 0;
} }
static const struct of_device_id clk_wzrd_ids[] = { static const struct of_device_id clk_wzrd_ids[] = {
...@@ -630,7 +628,7 @@ static struct platform_driver clk_wzrd_driver = { ...@@ -630,7 +628,7 @@ static struct platform_driver clk_wzrd_driver = {
.pm = &clk_wzrd_dev_pm_ops, .pm = &clk_wzrd_dev_pm_ops,
}, },
.probe = clk_wzrd_probe, .probe = clk_wzrd_probe,
.remove = clk_wzrd_remove, .remove_new = clk_wzrd_remove,
}; };
module_platform_driver(clk_wzrd_driver); module_platform_driver(clk_wzrd_driver);
......
...@@ -702,7 +702,7 @@ static int xvcu_probe(struct platform_device *pdev) ...@@ -702,7 +702,7 @@ static int xvcu_probe(struct platform_device *pdev)
* Return: Returns 0 on success * Return: Returns 0 on success
* Negative error code otherwise * Negative error code otherwise
*/ */
static int xvcu_remove(struct platform_device *pdev) static void xvcu_remove(struct platform_device *pdev)
{ {
struct xvcu_device *xvcu; struct xvcu_device *xvcu;
...@@ -714,8 +714,6 @@ static int xvcu_remove(struct platform_device *pdev) ...@@ -714,8 +714,6 @@ static int xvcu_remove(struct platform_device *pdev)
regmap_write(xvcu->logicore_reg_ba, VCU_GASKET_INIT, 0); regmap_write(xvcu->logicore_reg_ba, VCU_GASKET_INIT, 0);
clk_disable_unprepare(xvcu->aclk); clk_disable_unprepare(xvcu->aclk);
return 0;
} }
static const struct of_device_id xvcu_of_id_table[] = { static const struct of_device_id xvcu_of_id_table[] = {
...@@ -731,7 +729,7 @@ static struct platform_driver xvcu_driver = { ...@@ -731,7 +729,7 @@ static struct platform_driver xvcu_driver = {
.of_match_table = xvcu_of_id_table, .of_match_table = xvcu_of_id_table,
}, },
.probe = xvcu_probe, .probe = xvcu_probe,
.remove = xvcu_remove, .remove_new = xvcu_remove,
}; };
module_platform_driver(xvcu_driver); module_platform_driver(xvcu_driver);
......
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