spi: cadence: rename probe error labels

The "clk_dis_all" error label is not used to disable clocks since commit
f64b1600f92e ("spi: spi-cadence: Use helper function
devm_clk_get_enabled()").

Similarly, "remove_ctlr" drops a reference rather than deregisters the
controller.

Rename the labels after what they do.

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

diff --git a/drivers/spi/spi-cadence.c b/drivers/spi/spi-cadence.c
index 891e2ba36958498c0d1e1fbb67ef381c65b63118..f27586151ca93e1f26cb6a2510499da94dfcae27 100644 (file)
--- a/drivers/spi/spi-cadence.c
+++ b/drivers/spi/spi-cadence.c
@@ -656,21 +656,21 @@ static int cdns_spi_probe(struct platform_device *pdev)
        xspi->regs = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(xspi->regs)) {
                ret = PTR_ERR(xspi->regs);
-               goto remove_ctlr;
+               goto err_put_ctlr;
        }
 
        xspi->pclk = devm_clk_get_enabled(&pdev->dev, "pclk");
        if (IS_ERR(xspi->pclk)) {
                dev_err(&pdev->dev, "pclk clock not found.\n");
                ret = PTR_ERR(xspi->pclk);
-               goto remove_ctlr;
+               goto err_put_ctlr;
        }
 
        xspi->rstc = devm_reset_control_get_optional_exclusive(&pdev->dev, "spi");
        if (IS_ERR(xspi->rstc)) {
                ret = dev_err_probe(&pdev->dev, PTR_ERR(xspi->rstc),
                                    "Cannot get SPI reset.\n");
-               goto remove_ctlr;
+               goto err_put_ctlr;
        }
 
        reset_control_assert(xspi->rstc);
@@ -680,7 +680,7 @@ static int cdns_spi_probe(struct platform_device *pdev)
        if (IS_ERR(xspi->ref_clk)) {
                dev_err(&pdev->dev, "ref_clk clock not found.\n");
                ret = PTR_ERR(xspi->ref_clk);
-               goto remove_ctlr;
+               goto err_put_ctlr;
        }
 
        if (!spi_controller_is_target(ctlr)) {
@@ -710,7 +710,7 @@ static int cdns_spi_probe(struct platform_device *pdev)
        irq = platform_get_irq(pdev, 0);
        if (irq < 0) {
                ret = irq;
-               goto clk_dis_all;
+               goto err_disable_rpm;
        }
 
        ret = devm_request_irq(&pdev->dev, irq, cdns_spi_irq,
@@ -718,7 +718,7 @@ static int cdns_spi_probe(struct platform_device *pdev)
        if (ret != 0) {
                ret = -ENXIO;
                dev_err(&pdev->dev, "request_irq failed\n");
-               goto clk_dis_all;
+               goto err_disable_rpm;
        }
 
        ctlr->use_gpio_descriptors = true;
@@ -748,7 +748,7 @@ static int cdns_spi_probe(struct platform_device *pdev)
        ret = spi_register_controller(ctlr);
        if (ret) {
                dev_err(&pdev->dev, "spi_register_controller failed\n");
-               goto clk_dis_all;
+               goto err_disable_rpm;
        }
 
        if (!spi_controller_is_target(ctlr))
@@ -756,14 +756,14 @@ static int cdns_spi_probe(struct platform_device *pdev)
 
        return ret;
 
-clk_dis_all:
+err_disable_rpm:
        if (!spi_controller_is_target(ctlr)) {
                pm_runtime_disable(&pdev->dev);
                pm_runtime_set_suspended(&pdev->dev);
                pm_runtime_put_noidle(&pdev->dev);
                pm_runtime_dont_use_autosuspend(&pdev->dev);
        }
-remove_ctlr:
+err_put_ctlr:
        spi_controller_put(ctlr);
        return ret;
 }