]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
spi: lp8841-rtc: switch to managed controller allocation
authorJohan Hovold <johan@kernel.org>
Mon, 11 May 2026 15:04:04 +0000 (17:04 +0200)
committerMark Brown <broonie@kernel.org>
Mon, 18 May 2026 09:19:48 +0000 (10:19 +0100)
Switch to device managed controller allocation for consistency and to
simplify error handling.

Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20260511150408.796155-9-johan@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-lp8841-rtc.c

index e466866d5e80e9f1b28e625fcc8c27f12ac4b687..355d9df4d1befaec521876d9235177098fe1e4af 100644 (file)
@@ -185,7 +185,7 @@ spi_lp8841_rtc_probe(struct platform_device *pdev)
        struct spi_controller           *host;
        struct spi_lp8841_rtc           *data;
 
-       host = spi_alloc_host(&pdev->dev, sizeof(*data));
+       host = devm_spi_alloc_host(&pdev->dev, sizeof(*data));
        if (!host)
                return -ENOMEM;
        platform_set_drvdata(pdev, host);
@@ -208,23 +208,17 @@ spi_lp8841_rtc_probe(struct platform_device *pdev)
        ret = PTR_ERR_OR_ZERO(data->iomem);
        if (ret) {
                dev_err(&pdev->dev, "failed to get IO address\n");
-               goto err_put_host;
+               return ret;
        }
 
        /* register with the SPI framework */
        ret = devm_spi_register_controller(&pdev->dev, host);
        if (ret) {
                dev_err(&pdev->dev, "cannot register spi host\n");
-               goto err_put_host;
+               return ret;
        }
 
-       return ret;
-
-
-err_put_host:
-       spi_controller_put(host);
-
-       return ret;
+       return 0;
 }
 
 MODULE_ALIAS("platform:" DRIVER_NAME);