From: Krzysztof Kozlowski <krzk@kernel.org>
To: Jonathan Cameron <jic23@kernel.org>,
Lars-Peter Clausen <lars@metafoo.de>,
Peter Meerwald-Stadler <pmeerw@pmeerw.net>,
Peter Rosin <peda@axentia.se>,
Michael Hennerich <Michael.Hennerich@analog.com>,
Marek Vasut <marek.vasut@gmail.com>,
Tomasz Duszynski <tomasz.duszynski@octakon.com>,
linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-samsung-soc@vger.kernel.org,
linux-amlogic@lists.infradead.org,
linux-stm32@st-md-mailman.stormreply.com
Cc: Andy Shevchenko <andy.shevchenko@gmail.com>,
Krzysztof Kozlowski <krzk@kernel.org>
Subject: [PATCH v3 03/18] iio: adc: envelope-detector: Simplify with dev_err_probe()
Date: Sat, 29 Aug 2020 08:47:11 +0200 [thread overview]
Message-ID: <20200829064726.26268-3-krzk@kernel.org> (raw)
In-Reply-To: <20200829064726.26268-1-krzk@kernel.org>
Common pattern of handling deferred probe can be simplified with
dev_err_probe(). Less code and also it prints the error value.
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
---
Changes since v2:
1. Wrap dev_err_probe() lines at 80 character
Changes since v1:
1. Wrap dev_err_probe() lines at 100 character
---
drivers/iio/adc/envelope-detector.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/drivers/iio/adc/envelope-detector.c b/drivers/iio/adc/envelope-detector.c
index 2a4fd3bb64cf..d73eac36153f 100644
--- a/drivers/iio/adc/envelope-detector.c
+++ b/drivers/iio/adc/envelope-detector.c
@@ -348,11 +348,9 @@ static int envelope_detector_probe(struct platform_device *pdev)
indio_dev->num_channels = 1;
env->dac = devm_iio_channel_get(dev, "dac");
- if (IS_ERR(env->dac)) {
- if (PTR_ERR(env->dac) != -EPROBE_DEFER)
- dev_err(dev, "failed to get dac input channel\n");
- return PTR_ERR(env->dac);
- }
+ if (IS_ERR(env->dac))
+ return dev_err_probe(dev, PTR_ERR(env->dac),
+ "failed to get dac input channel\n");
env->comp_irq = platform_get_irq_byname(pdev, "comp");
if (env->comp_irq < 0)
@@ -360,11 +358,9 @@ static int envelope_detector_probe(struct platform_device *pdev)
ret = devm_request_irq(dev, env->comp_irq, envelope_detector_comp_isr,
0, "envelope-detector", env);
- if (ret) {
- if (ret != -EPROBE_DEFER)
- dev_err(dev, "failed to request interrupt\n");
- return ret;
- }
+ if (ret)
+ return dev_err_probe(dev, ret, "failed to request interrupt\n");
+
env->comp_irq_trigger = irq_get_trigger_type(env->comp_irq);
if (env->comp_irq_trigger & IRQF_TRIGGER_RISING)
env->comp_irq_trigger_inv |= IRQF_TRIGGER_FALLING;
--
2.17.1
next prev parent reply other threads:[~2020-08-29 6:48 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-29 6:47 [PATCH v3 01/18] iio: accel: bma180: Simplify with dev_err_probe() Krzysztof Kozlowski
2020-08-29 6:47 ` [PATCH v3 02/18] iio: accel: mma8452: " Krzysztof Kozlowski
2020-08-29 6:47 ` Krzysztof Kozlowski [this message]
2020-08-29 21:28 ` [PATCH v3 03/18] iio: adc: envelope-detector: " Peter Rosin
2020-08-29 6:47 ` [PATCH v3 04/18] iio: adc: exynos_adc: " Krzysztof Kozlowski
2020-08-29 6:47 ` [PATCH v3 05/18] iio: adc: ltc2497: " Krzysztof Kozlowski
2020-08-29 6:47 ` [PATCH v3 06/18] iio: adc: meson_saradc: " Krzysztof Kozlowski
2020-08-29 14:48 ` Martin Blumenstingl
2020-08-29 6:47 ` [PATCH v3 07/18] iio: adc: rcar-gyroadc: " Krzysztof Kozlowski
2020-08-29 6:47 ` [PATCH v3 08/18] iio: adc: stm32: " Krzysztof Kozlowski
2020-09-09 18:36 ` Jonathan Cameron
2020-09-09 19:57 ` Krzysztof Kozlowski
2020-09-09 21:25 ` Peter Rosin
[not found] ` <CAHp75Vc4-zkkWtOz8w7pA0Vu1yMAVodhPSLQ1NJH4K+j9XD52g@mail.gmail.com>
2020-09-10 6:58 ` Krzysztof Kozlowski
2020-09-10 8:12 ` Jonathan Cameron
2020-09-10 8:36 ` Krzysztof Kozlowski
2020-09-10 11:23 ` Andy Shevchenko
2020-08-29 6:47 ` [PATCH v3 09/18] iio: afe: iio-rescale: " Krzysztof Kozlowski
2020-08-29 21:28 ` Peter Rosin
2020-08-29 6:47 ` [PATCH v3 10/18] iio: amplifiers: hmc425a: " Krzysztof Kozlowski
2020-08-29 6:47 ` [PATCH v3 11/18] iio: chemical: scd30: " Krzysztof Kozlowski
2020-08-29 6:47 ` [PATCH v3 12/18] iio: dac: dpot-dac: " Krzysztof Kozlowski
2020-08-29 21:29 ` Peter Rosin
2020-08-29 6:47 ` [PATCH v3 13/18] iio: imu: inv_mpu6050: " Krzysztof Kozlowski
2020-08-29 6:47 ` [PATCH v3 14/18] iio: light: isl29018: " Krzysztof Kozlowski
2020-08-29 6:47 ` [PATCH v3 15/18] iio: light: tsl2772: " Krzysztof Kozlowski
2020-08-29 6:47 ` [PATCH v3 16/18] iio: magnetometer: ak8974: " Krzysztof Kozlowski
2020-08-29 6:47 ` [PATCH v3 17/18] iio: magnetometer: mag3110: " Krzysztof Kozlowski
2020-08-29 6:47 ` [PATCH v3 18/18] iio: multiplexer: iio-mux: " Krzysztof Kozlowski
2020-08-29 21:30 ` Peter Rosin
2020-08-29 14:34 ` [PATCH v3 01/18] iio: accel: bma180: " 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=20200829064726.26268-3-krzk@kernel.org \
--to=krzk@kernel.org \
--cc=Michael.Hennerich@analog.com \
--cc=andy.shevchenko@gmail.com \
--cc=jic23@kernel.org \
--cc=lars@metafoo.de \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=marek.vasut@gmail.com \
--cc=peda@axentia.se \
--cc=pmeerw@pmeerw.net \
--cc=tomasz.duszynski@octakon.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;
as well as URLs for NNTP newsgroup(s).