From: Angus Gardner <angusg778@gmail.com>
To: linux-iio@vger.kernel.org
Cc: linux-staging@lists.linux.dev, gregkh@linuxfoundation.org,
jic23@kernel.org, lars@metafoo.de, Michael.Hennerich@analog.com
Subject: [PATCH 2/3] staging: iio: ad9834: use dev_err_probe() in probe function
Date: Mon, 4 May 2026 19:20:58 +1000 [thread overview]
Message-ID: <20260504092059.1536094-3-angusg778@gmail.com> (raw)
In-Reply-To: <20260504092059.1536094-1-angusg778@gmail.com>
Replace open-coded dev_err() + return sequences with dev_err_probe(),
which is the preferred pattern for probe error paths as it handles
deferred probing correctly and reduces boilerplate.
Convert all three remaining instances in ad9834_probe():
- master clock enable failure
- device init SPI sync failure
The avdd regulator path already used dev_err_probe().
Signed-off-by: Angus Gardner <angusg778@gmail.com>
---
drivers/staging/iio/frequency/ad9834.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/iio/frequency/ad9834.c b/drivers/staging/iio/frequency/ad9834.c
index f2bf7123ffcf..0e4727fb8cde 100644
--- a/drivers/staging/iio/frequency/ad9834.c
+++ b/drivers/staging/iio/frequency/ad9834.c
@@ -394,10 +394,9 @@ static int ad9834_probe(struct spi_device *spi)
st = iio_priv(indio_dev);
mutex_init(&st->lock);
st->mclk = devm_clk_get_enabled(&spi->dev, NULL);
- if (IS_ERR(st->mclk)) {
- dev_err(&spi->dev, "Failed to enable master clock\n");
- return PTR_ERR(st->mclk);
- }
+ if (IS_ERR(st->mclk))
+ return dev_err_probe(&spi->dev, PTR_ERR(st->mclk),
+ "Failed to enable master clock\n");
st->spi = spi;
st->devid = spi_get_device_id(spi)->driver_data;
@@ -439,10 +438,9 @@ static int ad9834_probe(struct spi_device *spi)
st->data = cpu_to_be16(AD9834_REG_CMD | st->control);
ret = spi_sync(st->spi, &st->msg);
- if (ret) {
- dev_err(&spi->dev, "device init failed\n");
- return ret;
- }
+ if (ret)
+ return dev_err_probe(&spi->dev, ret,
+ "device init failed\n");
ret = ad9834_write_frequency(st, AD9834_REG_FREQ0, 1000000);
if (ret)
--
2.51.0
next prev parent reply other threads:[~2026-05-04 9:21 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-04 9:20 [PATCH v2 0/3] staging: iio: ad9834: driver cleanup Angus Gardner
2026-05-04 9:20 ` [PATCH 1/3] staging: iio: ad9834: simplify -ENOMEM return in probe Angus Gardner
2026-05-04 12:37 ` Maxwell Doose
2026-05-04 9:20 ` Angus Gardner [this message]
2026-05-04 9:20 ` [PATCH 3/3] staging: iio: ad9834: fix chip name typo in comments Angus Gardner
2026-05-04 12:33 ` Maxwell Doose
2026-05-04 15:23 ` [PATCH v2 0/3] staging: iio: ad9834: driver cleanup Jonathan Cameron
2026-05-04 16:10 ` Maxwell Doose
2026-05-04 16:54 ` Jonathan Cameron
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=20260504092059.1536094-3-angusg778@gmail.com \
--to=angusg778@gmail.com \
--cc=Michael.Hennerich@analog.com \
--cc=gregkh@linuxfoundation.org \
--cc=jic23@kernel.org \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
/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