From: Johan Hovold <johan@kernel.org>
Date: Tue, 21 Apr 2026 14:39:24 +0000 (+0200)
Subject: spi: axiado: rename probe error labels
X-Git-Tag: v7.1-rc1~18^2~1^2~1
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=821f0951b20880bd5976f73e202c2fa637c812f6;p=thirdparty%2Fkernel%2Flinux.git

spi: axiado: rename probe error labels

Rename the probe error labels after what they do.

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

diff --git a/drivers/spi/spi-axiado.c b/drivers/spi/spi-axiado.c
index 6449b376a3a8..a347774ae824 100644
--- a/drivers/spi/spi-axiado.c
+++ b/drivers/spi/spi-axiado.c
@@ -785,7 +785,7 @@ static int ax_spi_probe(struct platform_device *pdev)
 	ret = clk_prepare_enable(xspi->ref_clk);
 	if (ret) {
 		dev_err(&pdev->dev, "Unable to enable device clock.\n");
-		goto clk_dis_apb;
+		goto err_disable_apb;
 	}
 
 	pm_runtime_use_autosuspend(&pdev->dev);
@@ -815,7 +815,7 @@ static int ax_spi_probe(struct platform_device *pdev)
 	irq = platform_get_irq(pdev, 0);
 	if (irq <= 0) {
 		ret = -ENXIO;
-		goto clk_dis_all;
+		goto err_disable_rpm;
 	}
 
 	ret = devm_request_irq(&pdev->dev, irq, ax_spi_irq,
@@ -823,7 +823,7 @@ static int ax_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;
@@ -847,21 +847,21 @@ static int ax_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;
 	}
 
 	pm_runtime_put_autosuspend(&pdev->dev);
 
 	return ret;
 
-clk_dis_all:
+err_disable_rpm:
 	pm_runtime_disable(&pdev->dev);
 	pm_runtime_put_noidle(&pdev->dev);
 	pm_runtime_set_suspended(&pdev->dev);
 	pm_runtime_dont_use_autosuspend(&pdev->dev);
 
 	clk_disable_unprepare(xspi->ref_clk);
-clk_dis_apb:
+err_disable_apb:
 	clk_disable_unprepare(xspi->pclk);
 
 	return ret;