Skip to content

Commit 5fcf368

Browse files
Uwe Kleine-KönigKAGA-KOKO
authored andcommitted
irqchip/imx-irqsteer: Convert to platform_driver::remove_new() callback
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 ignored (apart from emitting a warning) 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. Eventually after all drivers are converted, .remove_new() will be renamed to .remove(). 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> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lore.kernel.org/r/c0e5afe62256860150d25bcf644f2b8d62794c86.1703284359.git.u.kleine-koenig@pengutronix.de
1 parent 984e5c7 commit 5fcf368

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

drivers/irqchip/irq-imx-irqsteer.c

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ static int imx_irqsteer_probe(struct platform_device *pdev)
231231
return ret;
232232
}
233233

234-
static int imx_irqsteer_remove(struct platform_device *pdev)
234+
static void imx_irqsteer_remove(struct platform_device *pdev)
235235
{
236236
struct irqsteer_data *irqsteer_data = platform_get_drvdata(pdev);
237237
int i;
@@ -243,8 +243,6 @@ static int imx_irqsteer_remove(struct platform_device *pdev)
243243
irq_domain_remove(irqsteer_data->domain);
244244

245245
clk_disable_unprepare(irqsteer_data->ipg_clk);
246-
247-
return 0;
248246
}
249247

250248
#ifdef CONFIG_PM
@@ -307,11 +305,11 @@ static const struct of_device_id imx_irqsteer_dt_ids[] = {
307305

308306
static struct platform_driver imx_irqsteer_driver = {
309307
.driver = {
310-
.name = "imx-irqsteer",
311-
.of_match_table = imx_irqsteer_dt_ids,
312-
.pm = &imx_irqsteer_pm_ops,
308+
.name = "imx-irqsteer",
309+
.of_match_table = imx_irqsteer_dt_ids,
310+
.pm = &imx_irqsteer_pm_ops,
313311
},
314-
.probe = imx_irqsteer_probe,
315-
.remove = imx_irqsteer_remove,
312+
.probe = imx_irqsteer_probe,
313+
.remove_new = imx_irqsteer_remove,
316314
};
317315
builtin_platform_driver(imx_irqsteer_driver);

0 commit comments

Comments
 (0)