From: Krzysztof Kozlowski <krzk@kernel.org>
To: Jonathan Cameron <jic23@kernel.org>,
Hartmut Knaack <knaack.h@gmx.de>,
Lars-Peter Clausen <lars@metafoo.de>,
Peter Meerwald-Stadler <pmeerw@pmeerw.net>,
Peter Rosin <peda@axentia.se>, Kukjin Kim <kgene@kernel.org>,
Krzysztof Kozlowski <krzk@kernel.org>,
Michael Hennerich <Michael.Hennerich@analog.com>,
Kevin Hilman <khilman@baylibre.com>,
Neil Armstrong <narmstrong@baylibre.com>,
Jerome Brunet <jbrunet@baylibre.com>,
Martin Blumenstingl <martin.blumenstingl@googlemail.com>,
Marek Vasut <marek.vasut@gmail.com>,
Maxime Coquelin <mcoquelin.stm32@gmail.com>,
Alexandre Torgue <alexandre.torgue@st.com>,
Beniamin Bia <beniamin.bia@analog.com>,
Tomasz Duszynski <tomasz.duszynski@octakon.com>,
Linus Walleij <linus.walleij@linaro.org>,
Jonathan Bakker <xc-racer2@live.ca>,
Alexandru Ardelean <alexandru.ardelean@analog.com>,
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
Subject: [PATCH 08/16] iio: adc: stm32: Simplify with dev_err_probe()
Date: Wed, 26 Aug 2020 16:51:45 +0200 [thread overview]
Message-ID: <20200826145153.10444-8-krzk@kernel.org> (raw)
In-Reply-To: <20200826145153.10444-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>
---
drivers/iio/adc/stm32-adc-core.c | 62 ++++++++++++-------------------
drivers/iio/adc/stm32-adc.c | 10 ++---
drivers/iio/adc/stm32-dfsdm-adc.c | 10 ++---
3 files changed, 30 insertions(+), 52 deletions(-)
diff --git a/drivers/iio/adc/stm32-adc-core.c b/drivers/iio/adc/stm32-adc-core.c
index 0e2068ec068b..184d5491c7ed 100644
--- a/drivers/iio/adc/stm32-adc-core.c
+++ b/drivers/iio/adc/stm32-adc-core.c
@@ -582,11 +582,9 @@ static int stm32_adc_core_switches_probe(struct device *dev,
priv->syscfg = syscon_regmap_lookup_by_phandle(np, "st,syscfg");
if (IS_ERR(priv->syscfg)) {
ret = PTR_ERR(priv->syscfg);
- if (ret != -ENODEV) {
- if (ret != -EPROBE_DEFER)
- dev_err(dev, "Can't probe syscfg: %d\n", ret);
- return ret;
- }
+ if (ret != -ENODEV)
+ return dev_err_probe(dev, ret, "Can't probe syscfg\n");
+
priv->syscfg = NULL;
}
@@ -596,12 +594,9 @@ static int stm32_adc_core_switches_probe(struct device *dev,
priv->booster = devm_regulator_get_optional(dev, "booster");
if (IS_ERR(priv->booster)) {
ret = PTR_ERR(priv->booster);
- if (ret != -ENODEV) {
- if (ret != -EPROBE_DEFER)
- dev_err(dev, "can't get booster %d\n",
- ret);
- return ret;
- }
+ if (ret != -ENODEV)
+ dev_err_probe(dev, ret, "can't get booster\n");
+
priv->booster = NULL;
}
}
@@ -612,11 +607,10 @@ static int stm32_adc_core_switches_probe(struct device *dev,
priv->vdd = devm_regulator_get_optional(dev, "vdd");
if (IS_ERR(priv->vdd)) {
ret = PTR_ERR(priv->vdd);
- if (ret != -ENODEV) {
- if (ret != -EPROBE_DEFER)
- dev_err(dev, "can't get vdd %d\n", ret);
- return ret;
- }
+ if (ret != -ENODEV)
+ return dev_err_probe(dev, ret,
+ "can't get vdd\n");
+
priv->vdd = NULL;
}
}
@@ -669,40 +663,32 @@ static int stm32_adc_probe(struct platform_device *pdev)
priv->common.phys_base = res->start;
priv->vdda = devm_regulator_get(&pdev->dev, "vdda");
- if (IS_ERR(priv->vdda)) {
- ret = PTR_ERR(priv->vdda);
- if (ret != -EPROBE_DEFER)
- dev_err(&pdev->dev, "vdda get failed, %d\n", ret);
- return ret;
- }
+ if (IS_ERR(priv->vdda))
+ return dev_err_probe(&pdev->dev, PTR_ERR(priv->vdda),
+ "vdda get failed\n");
priv->vref = devm_regulator_get(&pdev->dev, "vref");
- if (IS_ERR(priv->vref)) {
- ret = PTR_ERR(priv->vref);
- if (ret != -EPROBE_DEFER)
- dev_err(&pdev->dev, "vref get failed, %d\n", ret);
- return ret;
- }
+ if (IS_ERR(priv->vref))
+ return dev_err_probe(&pdev->dev, PTR_ERR(priv->vref),
+ "vref get failed\n");
priv->aclk = devm_clk_get(&pdev->dev, "adc");
if (IS_ERR(priv->aclk)) {
ret = PTR_ERR(priv->aclk);
- if (ret != -ENOENT) {
- if (ret != -EPROBE_DEFER)
- dev_err(&pdev->dev, "Can't get 'adc' clock\n");
- return ret;
- }
+ if (ret != -ENOENT)
+ return dev_err_probe(&pdev->dev, ret,
+ "Can't get 'adc' clock\n");
+
priv->aclk = NULL;
}
priv->bclk = devm_clk_get(&pdev->dev, "bus");
if (IS_ERR(priv->bclk)) {
ret = PTR_ERR(priv->bclk);
- if (ret != -ENOENT) {
- if (ret != -EPROBE_DEFER)
- dev_err(&pdev->dev, "Can't get 'bus' clock\n");
- return ret;
- }
+ if (ret != -ENOENT)
+ return dev_err_probe(&pdev->dev, ret,
+ "Can't get 'bus' clock\n");
+
priv->bclk = NULL;
}
diff --git a/drivers/iio/adc/stm32-adc.c b/drivers/iio/adc/stm32-adc.c
index 3eb9ebe8372f..b3f31f147347 100644
--- a/drivers/iio/adc/stm32-adc.c
+++ b/drivers/iio/adc/stm32-adc.c
@@ -1805,13 +1805,9 @@ static int stm32_adc_dma_request(struct device *dev, struct iio_dev *indio_dev)
adc->dma_chan = dma_request_chan(dev, "rx");
if (IS_ERR(adc->dma_chan)) {
ret = PTR_ERR(adc->dma_chan);
- if (ret != -ENODEV) {
- if (ret != -EPROBE_DEFER)
- dev_err(dev,
- "DMA channel request failed with %d\n",
- ret);
- return ret;
- }
+ if (ret != -ENODEV)
+ return dev_err_probe(dev, ret,
+ "DMA channel request failed with\n");
/* DMA is optional: fall back to IRQ mode */
adc->dma_chan = NULL;
diff --git a/drivers/iio/adc/stm32-dfsdm-adc.c b/drivers/iio/adc/stm32-dfsdm-adc.c
index 5e10fb4f3704..c7e0109315f8 100644
--- a/drivers/iio/adc/stm32-dfsdm-adc.c
+++ b/drivers/iio/adc/stm32-dfsdm-adc.c
@@ -1473,13 +1473,9 @@ static int stm32_dfsdm_adc_init(struct device *dev, struct iio_dev *indio_dev)
/* Optionally request DMA */
ret = stm32_dfsdm_dma_request(dev, indio_dev);
if (ret) {
- if (ret != -ENODEV) {
- if (ret != -EPROBE_DEFER)
- dev_err(dev,
- "DMA channel request failed with %d\n",
- ret);
- return ret;
- }
+ if (ret != -ENODEV)
+ return dev_err_probe(dev, ret,
+ "DMA channel request failed with\n");
dev_dbg(dev, "No DMA support\n");
return 0;
--
2.17.1
next prev parent reply other threads:[~2020-08-26 14:53 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-26 14:51 [PATCH 01/16] iio: accel: bma180: Simplify with dev_err_probe() Krzysztof Kozlowski
2020-08-26 14:51 ` [PATCH 02/16] iio: accel: mma8452: " Krzysztof Kozlowski
2020-08-26 14:51 ` [PATCH 03/16] iio: adc: envelope-detector: " Krzysztof Kozlowski
2020-08-26 14:51 ` [PATCH 04/16] iio: adc: exynos_adc: " Krzysztof Kozlowski
2020-08-26 14:51 ` [PATCH 05/16] iio: adc: ltc2497: " Krzysztof Kozlowski
2020-08-26 14:51 ` [PATCH 06/16] iio: adc: meson_saradc: " Krzysztof Kozlowski
2020-08-26 14:51 ` [PATCH 07/16] iio: adc: rcar-gyroadc: " Krzysztof Kozlowski
2020-08-26 14:51 ` Krzysztof Kozlowski [this message]
2020-08-26 16:17 ` [PATCH 08/16] iio: adc: stm32: " Krzysztof Kozlowski
2020-08-26 14:51 ` [PATCH 09/16] iio: afe: iio-rescale: " Krzysztof Kozlowski
2020-08-26 14:51 ` [PATCH 10/16] iio: amplifiers: hmc425a: " Krzysztof Kozlowski
2020-08-26 14:51 ` [PATCH 11/16] iio: chemical: scd30: " Krzysztof Kozlowski
2020-08-26 15:34 ` Tomasz Duszynski
2020-08-26 15:57 ` Krzysztof Kozlowski
2020-08-26 14:51 ` [PATCH 12/16] iio: dac: dpot-dac: " Krzysztof Kozlowski
2020-08-26 14:51 ` [PATCH 13/16] iio: imu: inv_mpu6050: " Krzysztof Kozlowski
2020-08-26 14:51 ` [PATCH 14/16] iio: light: isl29018: " Krzysztof Kozlowski
2020-08-26 14:51 ` [PATCH 15/16] iio: light: tsl2772: " Krzysztof Kozlowski
2020-08-26 14:51 ` [PATCH 16/16] iio: magnetometer: ak8974: " Krzysztof Kozlowski
2020-08-28 13:03 ` Linus Walleij
2020-08-27 11:26 ` [PATCH 01/16] iio: accel: bma180: " Jonathan Cameron
2020-08-27 11:28 ` Krzysztof Kozlowski
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=20200826145153.10444-8-krzk@kernel.org \
--to=krzk@kernel.org \
--cc=Michael.Hennerich@analog.com \
--cc=alexandre.torgue@st.com \
--cc=alexandru.ardelean@analog.com \
--cc=beniamin.bia@analog.com \
--cc=jbrunet@baylibre.com \
--cc=jic23@kernel.org \
--cc=kgene@kernel.org \
--cc=khilman@baylibre.com \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=linus.walleij@linaro.org \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.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=martin.blumenstingl@googlemail.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=narmstrong@baylibre.com \
--cc=peda@axentia.se \
--cc=pmeerw@pmeerw.net \
--cc=tomasz.duszynski@octakon.com \
--cc=xc-racer2@live.ca \
/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).