From: Johan Hovold <johan@kernel.org>
To: Mark Brown <broonie@kernel.org>
Cc: Vladimir Moravcevic <vmoravcevic@axiado.com>,
Tzu-Hao Wei <twei@axiado.com>, Swark Yang <syang@axiado.com>,
Prasad Bolisetty <pbolisetty@axiado.com>,
Harshit Shah <hshah@axiado.com>,
linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org,
Johan Hovold <johan@kernel.org>
Subject: [PATCH 2/3] spi: axiado: rename probe error labels
Date: Tue, 21 Apr 2026 16:39:24 +0200 [thread overview]
Message-ID: <20260421143925.1551781-3-johan@kernel.org> (raw)
In-Reply-To: <20260421143925.1551781-1-johan@kernel.org>
Rename the probe error labels after what they do.
Signed-off-by: Johan Hovold <johan@kernel.org>
---
drivers/spi/spi-axiado.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
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;
--
2.52.0
next prev parent reply other threads:[~2026-04-21 14:39 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-21 14:39 [PATCH 0/3] spi: axiado: spi: axiado: fix runtime pm imbalance on probe failure Johan Hovold
2026-04-21 14:39 ` [PATCH 1/3] " Johan Hovold
2026-04-21 14:39 ` Johan Hovold [this message]
2026-04-21 14:39 ` [PATCH 3/3] spi: axiado: clean up probe return value Johan Hovold
2026-04-22 14:06 ` [PATCH 0/3] spi: axiado: spi: axiado: fix runtime pm imbalance on probe failure Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260421143925.1551781-3-johan@kernel.org \
--to=johan@kernel.org \
--cc=broonie@kernel.org \
--cc=hshah@axiado.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=pbolisetty@axiado.com \
--cc=syang@axiado.com \
--cc=twei@axiado.com \
--cc=vmoravcevic@axiado.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox