Skip to content

Commit abe9da4

Browse files
Uwe Kleine-KönigKAGA-KOKO
authored andcommitted
irqchip/pruss-intc: 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/071057cfdc0bc52c574f74156b410c0337adb69c.1703284359.git.u.kleine-koenig@pengutronix.de
1 parent b7b5808 commit abe9da4

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

drivers/irqchip/irq-pruss-intc.c

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,7 @@ static int pruss_intc_probe(struct platform_device *pdev)
599599
return ret;
600600
}
601601

602-
static int pruss_intc_remove(struct platform_device *pdev)
602+
static void pruss_intc_remove(struct platform_device *pdev)
603603
{
604604
struct pruss_intc *intc = platform_get_drvdata(pdev);
605605
u8 max_system_events = intc->soc_config->num_system_events;
@@ -616,8 +616,6 @@ static int pruss_intc_remove(struct platform_device *pdev)
616616
irq_dispose_mapping(irq_find_mapping(intc->domain, hwirq));
617617

618618
irq_domain_remove(intc->domain);
619-
620-
return 0;
621619
}
622620

623621
static const struct pruss_intc_match_data pruss_intc_data = {
@@ -645,12 +643,12 @@ MODULE_DEVICE_TABLE(of, pruss_intc_of_match);
645643

646644
static struct platform_driver pruss_intc_driver = {
647645
.driver = {
648-
.name = "pruss-intc",
649-
.of_match_table = pruss_intc_of_match,
650-
.suppress_bind_attrs = true,
646+
.name = "pruss-intc",
647+
.of_match_table = pruss_intc_of_match,
648+
.suppress_bind_attrs = true,
651649
},
652-
.probe = pruss_intc_probe,
653-
.remove = pruss_intc_remove,
650+
.probe = pruss_intc_probe,
651+
.remove_new = pruss_intc_remove,
654652
};
655653
module_platform_driver(pruss_intc_driver);
656654

0 commit comments

Comments
 (0)