spi: atmel: switch to managed controller allocation

Switch to device managed controller allocation to simplify error
handling and to avoid having to take another reference during
deregistration.

Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20260429091333.165363-3-johan@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
index 42db85d7ff8e13637b52d56e38f9023e25a2c3a0..25aa294631c83464ba668702d2ef3ea1054f1488 100644 (file)
--- a/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c
@@ -1528,7 +1528,7 @@ static int atmel_spi_probe(struct platform_device *pdev)
                return PTR_ERR(clk);
 
        /* setup spi core then atmel-specific driver state */
-       host = spi_alloc_host(&pdev->dev, sizeof(*as));
+       host = devm_spi_alloc_host(&pdev->dev, sizeof(*as));
        if (!host)
                return -ENOMEM;
 
@@ -1555,18 +1555,15 @@ static int atmel_spi_probe(struct platform_device *pdev)
 
        as->pdev = pdev;
        as->regs = devm_platform_get_and_ioremap_resource(pdev, 0, &regs);
-       if (IS_ERR(as->regs)) {
-               ret = PTR_ERR(as->regs);
-               goto out_unmap_regs;
-       }
+       if (IS_ERR(as->regs))
+               return PTR_ERR(as->regs);
+
        as->phybase = regs->start;
        as->irq = irq;
        as->clk = clk;
        as->gclk = devm_clk_get_optional(&pdev->dev, "spi_gclk");
-       if (IS_ERR(as->gclk)) {
-               ret = PTR_ERR(as->gclk);
-               goto out_unmap_regs;
-       }
+       if (IS_ERR(as->gclk))
+               return PTR_ERR(as->gclk);
 
        init_completion(&as->xfer_completion);
 
@@ -1576,11 +1573,10 @@ static int atmel_spi_probe(struct platform_device *pdev)
        as->use_pdc = false;
        if (as->caps.has_dma_support) {
                ret = atmel_spi_configure_dma(host, as);
-               if (ret == 0) {
+               if (ret == 0)
                        as->use_dma = true;
-               } else if (ret == -EPROBE_DEFER) {
-                       goto out_unmap_regs;
-               }
+               else if (ret == -EPROBE_DEFER)
+                       return ret;
        } else if (as->caps.has_pdc_support) {
                as->use_pdc = true;
        }
@@ -1620,12 +1616,12 @@ static int atmel_spi_probe(struct platform_device *pdev)
                                        0, dev_name(&pdev->dev), host);
        }
        if (ret)
-               goto out_unmap_regs;
+               return ret;
 
        /* Initialize the hardware */
        ret = clk_prepare_enable(clk);
        if (ret)
-               goto out_free_irq;
+               return ret;
 
        /*
         * In cases where the peripheral clock is higher,the FLEX_SPI_CSRx.SCBR
@@ -1677,9 +1673,7 @@ out_free_dma:
        clk_disable_unprepare(as->gclk);
 out_disable_clk:
        clk_disable_unprepare(clk);
-out_free_irq:
-out_unmap_regs:
-       spi_controller_put(host);
+
        return ret;
 }
 
@@ -1688,8 +1682,6 @@ static void atmel_spi_remove(struct platform_device *pdev)
        struct spi_controller   *host = platform_get_drvdata(pdev);
        struct atmel_spi        *as = spi_controller_get_devdata(host);
 
-       spi_controller_get(host);
-
        pm_runtime_get_sync(&pdev->dev);
 
        spi_unregister_controller(host);
@@ -1720,8 +1712,6 @@ static void atmel_spi_remove(struct platform_device *pdev)
 
        pm_runtime_put_noidle(&pdev->dev);
        pm_runtime_disable(&pdev->dev);
-
-       spi_controller_put(host);
 }
 
 static int atmel_spi_runtime_suspend(struct device *dev)