* [PATCH v3 1/4] iio: light: cm3605: Make use of the helper function dev_err_probe()
@ 2021-10-08 9:26 Cai Huoqing
2021-10-08 9:26 ` [PATCH v3 2/4] iio: light: cm36651: " Cai Huoqing
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Cai Huoqing @ 2021-10-08 9:26 UTC (permalink / raw)
To: caihuoqing
Cc: Kevin Tsai, Jonathan Cameron, Lars-Peter Clausen, Linus Walleij,
linux-iio, linux-kernel
When possible use dev_err_probe help to properly deal with the
PROBE_DEFER error, the benefit is that DEFER issue will be logged
in the devices_deferred debugfs file.
Using dev_err_probe() can reduce code size, and the error value
gets printed.
Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
---
v2->v3:
*Handle platform_get_irq() that returns -EPROBE_DEFER.
*Handle the lack of availability of an IIO channel
by converting an -ENODEV to an -EPROBE_DEFER.
drivers/iio/light/cm3605.c | 29 +++++++++++++++--------------
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/drivers/iio/light/cm3605.c b/drivers/iio/light/cm3605.c
index 4c83953672be..3e7fb16ab1f6 100644
--- a/drivers/iio/light/cm3605.c
+++ b/drivers/iio/light/cm3605.c
@@ -159,6 +159,7 @@ static int cm3605_probe(struct platform_device *pdev)
struct device_node *np = dev->of_node;
enum iio_chan_type ch_type;
u32 rset;
+ int irq;
int ret;
indio_dev = devm_iio_device_alloc(dev, sizeof(*cm3605));
@@ -195,12 +196,9 @@ static int cm3605_probe(struct platform_device *pdev)
cm3605->aout = devm_iio_channel_get(dev, "aout");
if (IS_ERR(cm3605->aout)) {
- if (PTR_ERR(cm3605->aout) == -ENODEV) {
- dev_err(dev, "no ADC, deferring...\n");
- return -EPROBE_DEFER;
- }
- dev_err(dev, "failed to get AOUT ADC channel\n");
- return PTR_ERR(cm3605->aout);
+ ret = PTR_ERR(cm3605->aout);
+ ret = (ret == -ENODEV) ? -EPROBE_DEFER : ret;
+ return dev_err_probe(dev, ret, "failed to get AOUT ADC channel\n");
}
ret = iio_get_channel_type(cm3605->aout, &ch_type);
if (ret < 0)
@@ -211,10 +209,10 @@ static int cm3605_probe(struct platform_device *pdev)
}
cm3605->vdd = devm_regulator_get(dev, "vdd");
- if (IS_ERR(cm3605->vdd)) {
- dev_err(dev, "failed to get VDD regulator\n");
- return PTR_ERR(cm3605->vdd);
- }
+ if (IS_ERR(cm3605->vdd))
+ return dev_err_probe(dev, PTR_ERR(cm3605->vdd),
+ "failed to get VDD regulator\n");
+
ret = regulator_enable(cm3605->vdd);
if (ret) {
dev_err(dev, "failed to enable VDD regulator\n");
@@ -223,13 +221,16 @@ static int cm3605_probe(struct platform_device *pdev)
cm3605->aset = devm_gpiod_get(dev, "aset", GPIOD_OUT_HIGH);
if (IS_ERR(cm3605->aset)) {
- dev_err(dev, "no ASET GPIO\n");
- ret = PTR_ERR(cm3605->aset);
+ ret = dev_err_probe(dev, PTR_ERR(cm3605->aset), "no ASET GPIO\n");
goto out_disable_vdd;
}
- ret = devm_request_threaded_irq(dev, platform_get_irq(pdev, 0),
- cm3605_prox_irq, NULL, 0, "cm3605", indio_dev);
+ irq = platform_get_irq(pdev, 0);
+ if (irq < 0)
+ return dev_err_probe(dev, irq, "failed to get irq\n");
+
+ ret = devm_request_threaded_irq(dev, irq, cm3605_prox_irq,
+ NULL, 0, "cm3605", indio_dev);
if (ret) {
dev_err(dev, "unable to request IRQ\n");
goto out_disable_aset;
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v3 2/4] iio: light: cm36651: Make use of the helper function dev_err_probe()
2021-10-08 9:26 [PATCH v3 1/4] iio: light: cm3605: Make use of the helper function dev_err_probe() Cai Huoqing
@ 2021-10-08 9:26 ` Cai Huoqing
2021-10-08 9:26 ` [PATCH v3 3/4] iio: light: gp2ap002: " Cai Huoqing
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Cai Huoqing @ 2021-10-08 9:26 UTC (permalink / raw)
To: caihuoqing
Cc: Kevin Tsai, Jonathan Cameron, Lars-Peter Clausen, Linus Walleij,
linux-iio, linux-kernel
When possible use dev_err_probe help to properly deal with the
PROBE_DEFER error, the benefit is that DEFER issue will be logged
in the devices_deferred debugfs file.
Using dev_err_probe() can reduce code size, and the error value
gets printed.
Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
---
v1->v2: Remove the separate line of PTR_ERR().
v2 is applied to the togreg branch of iio.git
drivers/iio/light/cm36651.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/iio/light/cm36651.c b/drivers/iio/light/cm36651.c
index fd83a19929bc..89f5e48a6642 100644
--- a/drivers/iio/light/cm36651.c
+++ b/drivers/iio/light/cm36651.c
@@ -632,10 +632,9 @@ static int cm36651_probe(struct i2c_client *client,
cm36651 = iio_priv(indio_dev);
cm36651->vled_reg = devm_regulator_get(&client->dev, "vled");
- if (IS_ERR(cm36651->vled_reg)) {
- dev_err(&client->dev, "get regulator vled failed\n");
- return PTR_ERR(cm36651->vled_reg);
- }
+ if (IS_ERR(cm36651->vled_reg))
+ return dev_err_probe(&client->dev, PTR_ERR(cm36651->vled_reg),
+ "get regulator vled failed\n");
ret = regulator_enable(cm36651->vled_reg);
if (ret) {
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v3 3/4] iio: light: gp2ap002: Make use of the helper function dev_err_probe()
2021-10-08 9:26 [PATCH v3 1/4] iio: light: cm3605: Make use of the helper function dev_err_probe() Cai Huoqing
2021-10-08 9:26 ` [PATCH v3 2/4] iio: light: cm36651: " Cai Huoqing
@ 2021-10-08 9:26 ` Cai Huoqing
2021-10-08 9:26 ` [PATCH v3 4/4] iio: light: noa1305: " Cai Huoqing
2021-10-12 23:45 ` [PATCH v3 1/4] iio: light: cm3605: " Linus Walleij
3 siblings, 0 replies; 6+ messages in thread
From: Cai Huoqing @ 2021-10-08 9:26 UTC (permalink / raw)
To: caihuoqing
Cc: Kevin Tsai, Jonathan Cameron, Lars-Peter Clausen, Linus Walleij,
linux-iio, linux-kernel
When possible use dev_err_probe help to properly deal with the
PROBE_DEFER error, the benefit is that DEFER issue will be logged
in the devices_deferred debugfs file.
Using dev_err_probe() can reduce code size, and the error value
gets printed.
Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
---
v2: Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
v2->v3:
*Handle the lack of availability of an IIO channel
by converting an -ENODEV to an -EPROBE_DEFER.
drivers/iio/light/gp2ap002.c | 24 ++++++++++--------------
1 file changed, 10 insertions(+), 14 deletions(-)
diff --git a/drivers/iio/light/gp2ap002.c b/drivers/iio/light/gp2ap002.c
index f960be7d4001..c6d1d88d3775 100644
--- a/drivers/iio/light/gp2ap002.c
+++ b/drivers/iio/light/gp2ap002.c
@@ -503,12 +503,9 @@ static int gp2ap002_probe(struct i2c_client *client,
if (!gp2ap002->is_gp2ap002s00f) {
gp2ap002->alsout = devm_iio_channel_get(dev, "alsout");
if (IS_ERR(gp2ap002->alsout)) {
- if (PTR_ERR(gp2ap002->alsout) == -ENODEV) {
- dev_err(dev, "no ADC, deferring...\n");
- return -EPROBE_DEFER;
- }
- dev_err(dev, "failed to get ALSOUT ADC channel\n");
- return PTR_ERR(gp2ap002->alsout);
+ ret = PTR_ERR(gp2ap002->alsout);
+ ret = (ret == -ENODEV) ? -EPROBE_DEFER : ret;
+ return dev_err_probe(dev, ret, "failed to get ALSOUT ADC channel\n");
}
ret = iio_get_channel_type(gp2ap002->alsout, &ch_type);
if (ret < 0)
@@ -521,15 +518,14 @@ static int gp2ap002_probe(struct i2c_client *client,
}
gp2ap002->vdd = devm_regulator_get(dev, "vdd");
- if (IS_ERR(gp2ap002->vdd)) {
- dev_err(dev, "failed to get VDD regulator\n");
- return PTR_ERR(gp2ap002->vdd);
- }
+ if (IS_ERR(gp2ap002->vdd))
+ return dev_err_probe(dev, PTR_ERR(gp2ap002->vdd),
+ "failed to get VDD regulator\n");
+
gp2ap002->vio = devm_regulator_get(dev, "vio");
- if (IS_ERR(gp2ap002->vio)) {
- dev_err(dev, "failed to get VIO regulator\n");
- return PTR_ERR(gp2ap002->vio);
- }
+ if (IS_ERR(gp2ap002->vio))
+ return dev_err_probe(dev, PTR_ERR(gp2ap002->vio),
+ "failed to get VIO regulator\n");
/* Operating voltage 2.4V .. 3.6V according to datasheet */
ret = regulator_set_voltage(gp2ap002->vdd, 2400000, 3600000);
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v3 4/4] iio: light: noa1305: Make use of the helper function dev_err_probe()
2021-10-08 9:26 [PATCH v3 1/4] iio: light: cm3605: Make use of the helper function dev_err_probe() Cai Huoqing
2021-10-08 9:26 ` [PATCH v3 2/4] iio: light: cm36651: " Cai Huoqing
2021-10-08 9:26 ` [PATCH v3 3/4] iio: light: gp2ap002: " Cai Huoqing
@ 2021-10-08 9:26 ` Cai Huoqing
2021-10-12 23:45 ` [PATCH v3 1/4] iio: light: cm3605: " Linus Walleij
3 siblings, 0 replies; 6+ messages in thread
From: Cai Huoqing @ 2021-10-08 9:26 UTC (permalink / raw)
To: caihuoqing
Cc: Kevin Tsai, Jonathan Cameron, Lars-Peter Clausen, Linus Walleij,
linux-iio, linux-kernel
When possible use dev_err_probe help to properly deal with the
PROBE_DEFER error, the benefit is that DEFER issue will be logged
in the devices_deferred debugfs file.
Using dev_err_probe() can reduce code size, and the error value
gets printed.
Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
---
v1->v2: Remove the separate line of PTR_ERR().
v2 is applied to the togreg branch of iio.git
drivers/iio/light/noa1305.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/iio/light/noa1305.c b/drivers/iio/light/noa1305.c
index a308fbc2fc7b..ee81fe083e4c 100644
--- a/drivers/iio/light/noa1305.c
+++ b/drivers/iio/light/noa1305.c
@@ -217,10 +217,9 @@ static int noa1305_probe(struct i2c_client *client,
priv = iio_priv(indio_dev);
priv->vin_reg = devm_regulator_get(&client->dev, "vin");
- if (IS_ERR(priv->vin_reg)) {
- dev_err(&client->dev, "get regulator vin failed\n");
- return PTR_ERR(priv->vin_reg);
- }
+ if (IS_ERR(priv->vin_reg))
+ return dev_err_probe(&client->dev, PTR_ERR(priv->vin_reg),
+ "get regulator vin failed\n");
ret = regulator_enable(priv->vin_reg);
if (ret) {
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v3 1/4] iio: light: cm3605: Make use of the helper function dev_err_probe()
2021-10-08 9:26 [PATCH v3 1/4] iio: light: cm3605: Make use of the helper function dev_err_probe() Cai Huoqing
` (2 preceding siblings ...)
2021-10-08 9:26 ` [PATCH v3 4/4] iio: light: noa1305: " Cai Huoqing
@ 2021-10-12 23:45 ` Linus Walleij
2021-10-17 11:56 ` Jonathan Cameron
3 siblings, 1 reply; 6+ messages in thread
From: Linus Walleij @ 2021-10-12 23:45 UTC (permalink / raw)
To: Cai Huoqing
Cc: Kevin Tsai, Jonathan Cameron, Lars-Peter Clausen, linux-iio,
linux-kernel
On Fri, Oct 8, 2021 at 11:27 AM Cai Huoqing <caihuoqing@baidu.com> wrote:
> When possible use dev_err_probe help to properly deal with the
> PROBE_DEFER error, the benefit is that DEFER issue will be logged
> in the devices_deferred debugfs file.
> Using dev_err_probe() can reduce code size, and the error value
> gets printed.
>
> Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
> ---
> v2->v3:
> *Handle platform_get_irq() that returns -EPROBE_DEFER.
> *Handle the lack of availability of an IIO channel
> by converting an -ENODEV to an -EPROBE_DEFER.
This looks good to me!
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3 1/4] iio: light: cm3605: Make use of the helper function dev_err_probe()
2021-10-12 23:45 ` [PATCH v3 1/4] iio: light: cm3605: " Linus Walleij
@ 2021-10-17 11:56 ` Jonathan Cameron
0 siblings, 0 replies; 6+ messages in thread
From: Jonathan Cameron @ 2021-10-17 11:56 UTC (permalink / raw)
To: Linus Walleij
Cc: Cai Huoqing, Kevin Tsai, Lars-Peter Clausen, linux-iio, linux-kernel
On Wed, 13 Oct 2021 01:45:47 +0200
Linus Walleij <linus.walleij@linaro.org> wrote:
> On Fri, Oct 8, 2021 at 11:27 AM Cai Huoqing <caihuoqing@baidu.com> wrote:
>
> > When possible use dev_err_probe help to properly deal with the
> > PROBE_DEFER error, the benefit is that DEFER issue will be logged
> > in the devices_deferred debugfs file.
> > Using dev_err_probe() can reduce code size, and the error value
> > gets printed.
> >
> > Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
> > ---
> > v2->v3:
> > *Handle platform_get_irq() that returns -EPROBE_DEFER.
> > *Handle the lack of availability of an IIO channel
> > by converting an -ENODEV to an -EPROBE_DEFER.
>
> This looks good to me!
> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
>
> Yours,
> Linus Walleij
Patches 1 and 3 applied (2 and 4 were applied at v2).
Thanks,
Jonathan
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-10-17 11:52 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-08 9:26 [PATCH v3 1/4] iio: light: cm3605: Make use of the helper function dev_err_probe() Cai Huoqing
2021-10-08 9:26 ` [PATCH v3 2/4] iio: light: cm36651: " Cai Huoqing
2021-10-08 9:26 ` [PATCH v3 3/4] iio: light: gp2ap002: " Cai Huoqing
2021-10-08 9:26 ` [PATCH v3 4/4] iio: light: noa1305: " Cai Huoqing
2021-10-12 23:45 ` [PATCH v3 1/4] iio: light: cm3605: " Linus Walleij
2021-10-17 11:56 ` Jonathan Cameron
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).