diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2023-03-03 18:19:31 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-03-06 12:31:17 +0000 |
| commit | f74d4b8b97e39b31ad88f6f679180c0800d57a0c (patch) | |
| tree | 59dd5fa8869c59d6170730a32cd6c18d2a7a8362 | |
| parent | 427353015333a1e0d6f61785a2f134c4c382f11f (diff) | |
| download | lwn-f74d4b8b97e39b31ad88f6f679180c0800d57a0c.tar.gz lwn-f74d4b8b97e39b31ad88f6f679180c0800d57a0c.zip | |
spi: cavium-octeon: 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: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20230303172041.2103336-18-u.kleine-koenig@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | drivers/spi/spi-cavium-octeon.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/spi/spi-cavium-octeon.c b/drivers/spi/spi-cavium-octeon.c index 1a2de6ce9064..58060be33106 100644 --- a/drivers/spi/spi-cavium-octeon.c +++ b/drivers/spi/spi-cavium-octeon.c @@ -69,15 +69,13 @@ fail: return err; } -static int octeon_spi_remove(struct platform_device *pdev) +static void octeon_spi_remove(struct platform_device *pdev) { struct spi_master *master = platform_get_drvdata(pdev); struct octeon_spi *p = spi_master_get_devdata(master); /* Clear the CSENA* and put everything in a known state. */ writeq(0, p->register_base + OCTEON_SPI_CFG(p)); - - return 0; } static const struct of_device_id octeon_spi_match[] = { @@ -92,7 +90,7 @@ static struct platform_driver octeon_spi_driver = { .of_match_table = octeon_spi_match, }, .probe = octeon_spi_probe, - .remove = octeon_spi_remove, + .remove_new = octeon_spi_remove, }; module_platform_driver(octeon_spi_driver); |