spi: bcm2835: 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.

Convert this driver from always returning zero in the remove callback to
the void returning variant.

Now that bcm2835_spi_remove returns no error code any more,
bcm2835_spi_shutdown() does the same thing as bcm2835_spi_remove(). So
drop the shutdown function and use bcm2835_spi_remove() as .shutdown
callback.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Link: https://lore.kernel.org/r/20230330211022.2460233-1-u.kleine-koenig@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c
index 6b7a3fa93fdf6a2bfb8a23f5228ea2829a57fe8e..3b253da98c05628ffacdba0b74cfe2282ed581ff 100644 (file)
--- a/drivers/spi/spi-bcm2835.c
+++ b/drivers/spi/spi-bcm2835.c
@@ -1399,7 +1399,7 @@ out_clk_disable:
        return err;
 }
 
-static int bcm2835_spi_remove(struct platform_device *pdev)
+static void bcm2835_spi_remove(struct platform_device *pdev)
 {
        struct spi_controller *ctlr = platform_get_drvdata(pdev);
        struct bcm2835_spi *bs = spi_controller_get_devdata(ctlr);
@@ -1415,17 +1415,6 @@ static int bcm2835_spi_remove(struct platform_device *pdev)
                   BCM2835_SPI_CS_CLEAR_RX | BCM2835_SPI_CS_CLEAR_TX);
 
        clk_disable_unprepare(bs->clk);
-
-       return 0;
-}
-
-static void bcm2835_spi_shutdown(struct platform_device *pdev)
-{
-       int ret;
-
-       ret = bcm2835_spi_remove(pdev);
-       if (ret)
-               dev_err(&pdev->dev, "failed to shutdown\n");
 }
 
 static const struct of_device_id bcm2835_spi_match[] = {
@@ -1440,8 +1429,8 @@ static struct platform_driver bcm2835_spi_driver = {
                .of_match_table = bcm2835_spi_match,
        },
        .probe          = bcm2835_spi_probe,
-       .remove         = bcm2835_spi_remove,
-       .shutdown       = bcm2835_spi_shutdown,
+       .remove_new     = bcm2835_spi_remove,
+       .shutdown       = bcm2835_spi_remove,
 };
 module_platform_driver(bcm2835_spi_driver);