]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
spi: falcon: switch to managed controller allocation
authorJohan Hovold <johan@kernel.org>
Mon, 11 May 2026 15:04:00 +0000 (17:04 +0200)
committerMark Brown <broonie@kernel.org>
Mon, 18 May 2026 09:19:44 +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-5-johan@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-falcon.c

index cb15faabd88f2f72c82769f757b7b9de4c33dcfc..e00e808eafeee4e34b76def5459621dbc580be8a 100644 (file)
@@ -392,9 +392,8 @@ static int falcon_sflash_probe(struct platform_device *pdev)
 {
        struct falcon_sflash *priv;
        struct spi_controller *host;
-       int ret;
 
-       host = spi_alloc_host(&pdev->dev, sizeof(*priv));
+       host = devm_spi_alloc_host(&pdev->dev, sizeof(*priv));
        if (!host)
                return -ENOMEM;
 
@@ -406,10 +405,7 @@ static int falcon_sflash_probe(struct platform_device *pdev)
        host->setup = falcon_sflash_setup;
        host->transfer_one_message = falcon_sflash_xfer_one;
 
-       ret = devm_spi_register_controller(&pdev->dev, host);
-       if (ret)
-               spi_controller_put(host);
-       return ret;
+       return devm_spi_register_controller(&pdev->dev, host);
 }
 
 static const struct of_device_id falcon_sflash_match[] = {