spi: rockchip: 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/20260324082326.901043-6-johan@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c
index eb1992b4178e2ef43e0bf3b472a40309ba89b40f..14cd1b9d9793e2d15772fdefaace0b3c7898a095 100644 (file)
--- a/drivers/spi/spi-rockchip.c
+++ b/drivers/spi/spi-rockchip.c
@@ -767,9 +767,9 @@ static int rockchip_spi_probe(struct platform_device *pdev)
        target_mode = of_property_read_bool(np, "spi-slave");
 
        if (target_mode)
-               ctlr = spi_alloc_target(&pdev->dev, sizeof(struct rockchip_spi));
+               ctlr = devm_spi_alloc_target(&pdev->dev, sizeof(*rs));
        else
-               ctlr = spi_alloc_host(&pdev->dev, sizeof(struct rockchip_spi));
+               ctlr = devm_spi_alloc_host(&pdev->dev, sizeof(*rs));
 
        if (!ctlr)
                return -ENOMEM;
@@ -780,35 +780,31 @@ static int rockchip_spi_probe(struct platform_device *pdev)
 
        /* Get basic io resource and map it */
        rs->regs = devm_platform_get_and_ioremap_resource(pdev, 0, &mem);
-       if (IS_ERR(rs->regs)) {
-               ret = PTR_ERR(rs->regs);
-               goto err_put_ctlr;
-       }
+       if (IS_ERR(rs->regs))
+               return PTR_ERR(rs->regs);
 
        rs->apb_pclk = devm_clk_get_enabled(&pdev->dev, "apb_pclk");
        if (IS_ERR(rs->apb_pclk)) {
-               ret = dev_err_probe(&pdev->dev, PTR_ERR(rs->apb_pclk),
-                                   "Failed to get apb_pclk\n");
-               goto err_put_ctlr;
+               return dev_err_probe(&pdev->dev, PTR_ERR(rs->apb_pclk),
+                                    "Failed to get apb_pclk\n");
        }
 
        rs->spiclk = devm_clk_get_enabled(&pdev->dev, "spiclk");
        if (IS_ERR(rs->spiclk)) {
-               ret = dev_err_probe(&pdev->dev, PTR_ERR(rs->spiclk),
-                                   "Failed to get spi_pclk\n");
-               goto err_put_ctlr;
+               return dev_err_probe(&pdev->dev, PTR_ERR(rs->spiclk),
+                                    "Failed to get spi_pclk\n");
        }
 
        spi_enable_chip(rs, false);
 
        ret = platform_get_irq(pdev, 0);
        if (ret < 0)
-               goto err_put_ctlr;
+               return ret;
 
        ret = devm_request_irq(&pdev->dev, ret, rockchip_spi_isr, 0,
                               dev_name(&pdev->dev), ctlr);
        if (ret)
-               goto err_put_ctlr;
+               return ret;
 
        rs->dev = &pdev->dev;
        rs->freq = clk_get_rate(rs->spiclk);
@@ -830,10 +826,8 @@ static int rockchip_spi_probe(struct platform_device *pdev)
        }
 
        rs->fifo_len = get_fifo_len(rs);
-       if (!rs->fifo_len) {
-               ret = dev_err_probe(&pdev->dev, -EINVAL, "Failed to get fifo length\n");
-               goto err_put_ctlr;
-       }
+       if (!rs->fifo_len)
+               return dev_err_probe(&pdev->dev, -EINVAL, "Failed to get fifo length\n");
 
        pm_runtime_set_autosuspend_delay(&pdev->dev, ROCKCHIP_AUTOSUSPEND_TIMEOUT);
        pm_runtime_use_autosuspend(&pdev->dev);
@@ -924,15 +918,13 @@ err_free_dma_tx:
                dma_release_channel(ctlr->dma_tx);
 err_disable_pm_runtime:
        pm_runtime_disable(&pdev->dev);
-err_put_ctlr:
-       spi_controller_put(ctlr);
 
        return ret;
 }
 
 static void rockchip_spi_remove(struct platform_device *pdev)
 {
-       struct spi_controller *ctlr = spi_controller_get(platform_get_drvdata(pdev));
+       struct spi_controller *ctlr = platform_get_drvdata(pdev);
 
        pm_runtime_get_sync(&pdev->dev);
 
@@ -946,8 +938,6 @@ static void rockchip_spi_remove(struct platform_device *pdev)
                dma_release_channel(ctlr->dma_tx);
        if (ctlr->dma_rx)
                dma_release_channel(ctlr->dma_rx);
-
-       spi_controller_put(ctlr);
 }
 
 #ifdef CONFIG_PM_SLEEP