Commit 788f501a authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Greg Kroah-Hartman

serial: amba-pl011: 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 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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20231110152927.70601-7-u.kleine-koenig@pengutronix.deSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b0f698b8
...@@ -2939,13 +2939,12 @@ static int sbsa_uart_probe(struct platform_device *pdev) ...@@ -2939,13 +2939,12 @@ static int sbsa_uart_probe(struct platform_device *pdev)
return pl011_register_port(uap); return pl011_register_port(uap);
} }
static int sbsa_uart_remove(struct platform_device *pdev) static void sbsa_uart_remove(struct platform_device *pdev)
{ {
struct uart_amba_port *uap = platform_get_drvdata(pdev); struct uart_amba_port *uap = platform_get_drvdata(pdev);
uart_remove_one_port(&amba_reg, &uap->port); uart_remove_one_port(&amba_reg, &uap->port);
pl011_unregister_port(uap); pl011_unregister_port(uap);
return 0;
} }
static const struct of_device_id sbsa_uart_of_match[] = { static const struct of_device_id sbsa_uart_of_match[] = {
...@@ -2963,7 +2962,7 @@ MODULE_DEVICE_TABLE(acpi, sbsa_uart_acpi_match); ...@@ -2963,7 +2962,7 @@ MODULE_DEVICE_TABLE(acpi, sbsa_uart_acpi_match);
static struct platform_driver arm_sbsa_uart_platform_driver = { static struct platform_driver arm_sbsa_uart_platform_driver = {
.probe = sbsa_uart_probe, .probe = sbsa_uart_probe,
.remove = sbsa_uart_remove, .remove_new = sbsa_uart_remove,
.driver = { .driver = {
.name = "sbsa-uart", .name = "sbsa-uart",
.pm = &pl011_dev_pm_ops, .pm = &pl011_dev_pm_ops,
......
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