spi: zync-qspi: 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/20260505072909.618363-21-johan@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-zynq-qspi.c b/drivers/spi/spi-zynq-qspi.c
index 406fd9d5337eec90f73dd8f021fe95a0345642fe..d762aaf452afde6fa8f4878a1d6d259750af4f5c 100644 (file)
--- a/drivers/spi/spi-zynq-qspi.c
+++ b/drivers/spi/spi-zynq-qspi.c
@@ -637,7 +637,7 @@ static int zynq_qspi_probe(struct platform_device *pdev)
        struct zynq_qspi *xqspi;
        u32 num_cs;
 
-       ctlr = spi_alloc_host(&pdev->dev, sizeof(*xqspi));
+       ctlr = devm_spi_alloc_host(&pdev->dev, sizeof(*xqspi));
        if (!ctlr)
                return -ENOMEM;
 
@@ -645,16 +645,13 @@ static int zynq_qspi_probe(struct platform_device *pdev)
        xqspi->dev = dev;
        platform_set_drvdata(pdev, ctlr);
        xqspi->regs = devm_platform_ioremap_resource(pdev, 0);
-       if (IS_ERR(xqspi->regs)) {
-               ret = PTR_ERR(xqspi->regs);
-               goto remove_ctlr;
-       }
+       if (IS_ERR(xqspi->regs))
+               return PTR_ERR(xqspi->regs);
 
        xqspi->pclk = devm_clk_get_enabled(&pdev->dev, "pclk");
        if (IS_ERR(xqspi->pclk)) {
                dev_err(&pdev->dev, "pclk clock not found.\n");
-               ret = PTR_ERR(xqspi->pclk);
-               goto remove_ctlr;
+               return PTR_ERR(xqspi->pclk);
        }
 
        init_completion(&xqspi->data_completion);
@@ -662,21 +659,18 @@ static int zynq_qspi_probe(struct platform_device *pdev)
        xqspi->refclk = devm_clk_get_enabled(&pdev->dev, "ref_clk");
        if (IS_ERR(xqspi->refclk)) {
                dev_err(&pdev->dev, "ref_clk clock not found.\n");
-               ret = PTR_ERR(xqspi->refclk);
-               goto remove_ctlr;
+               return PTR_ERR(xqspi->refclk);
        }
 
        xqspi->irq = platform_get_irq(pdev, 0);
-       if (xqspi->irq < 0) {
-               ret = xqspi->irq;
-               goto remove_ctlr;
-       }
+       if (xqspi->irq < 0)
+               return xqspi->irq;
+
        ret = devm_request_irq(&pdev->dev, xqspi->irq, zynq_qspi_irq,
                               0, pdev->name, xqspi);
        if (ret != 0) {
-               ret = -ENXIO;
                dev_err(&pdev->dev, "request_irq failed\n");
-               goto remove_ctlr;
+               return -ENXIO;
        }
 
        ret = of_property_read_u32(np, "num-cs",
@@ -684,9 +678,8 @@ static int zynq_qspi_probe(struct platform_device *pdev)
        if (ret < 0) {
                ctlr->num_chipselect = 1;
        } else if (num_cs > ZYNQ_QSPI_MAX_NUM_CS) {
-               ret = -EINVAL;
                dev_err(&pdev->dev, "only 2 chip selects are available\n");
-               goto remove_ctlr;
+               return -EINVAL;
        } else {
                ctlr->num_chipselect = num_cs;
        }
@@ -705,15 +698,10 @@ static int zynq_qspi_probe(struct platform_device *pdev)
        ret = spi_register_controller(ctlr);
        if (ret) {
                dev_err(&pdev->dev, "failed to register controller\n");
-               goto remove_ctlr;
+               return ret;
        }
 
-       return ret;
-
-remove_ctlr:
-       spi_controller_put(ctlr);
-
-       return ret;
+       return 0;
 }
 
 /**
@@ -731,13 +719,9 @@ static void zynq_qspi_remove(struct platform_device *pdev)
        struct spi_controller *ctlr = platform_get_drvdata(pdev);
        struct zynq_qspi *xqspi = spi_controller_get_devdata(ctlr);
 
-       spi_controller_get(ctlr);
-
        spi_unregister_controller(ctlr);
 
        zynq_qspi_write(xqspi, ZYNQ_QSPI_ENABLE_OFFSET, 0);
-
-       spi_controller_put(ctlr);
 }
 
 static const struct of_device_id zynq_qspi_of_match[] = {