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 <[email protected]>
---
v1->v2: Remove the separate line of PTR_ERR().
v2: Reviewed-by: Linus Walleij <[email protected]>
v2->v3: Handle platform_get_irq_byname() that returns -EPROBE_DEFER.
drivers/iio/adc/ab8500-gpadc.c | 22 +++++++++-------------
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/drivers/iio/adc/ab8500-gpadc.c b/drivers/iio/adc/ab8500-gpadc.c
index 7b5212ba5501..4c46a201d4ef 100644
--- a/drivers/iio/adc/ab8500-gpadc.c
+++ b/drivers/iio/adc/ab8500-gpadc.c
@@ -1103,17 +1103,15 @@ static int ab8500_gpadc_probe(struct platform_device *pdev)
return ret;
gpadc->irq_sw = platform_get_irq_byname(pdev, "SW_CONV_END");
- if (gpadc->irq_sw < 0) {
- dev_err(dev, "failed to get platform sw_conv_end irq\n");
- return gpadc->irq_sw;
- }
+ if (gpadc->irq_sw < 0)
+ return dev_err_probe(dev, gpadc->irq_sw,
+ "failed to get platform sw_conv_end irq\n");
if (is_ab8500(gpadc->ab8500)) {
gpadc->irq_hw = platform_get_irq_byname(pdev, "HW_CONV_END");
- if (gpadc->irq_hw < 0) {
- dev_err(dev, "failed to get platform hw_conv_end irq\n");
- return gpadc->irq_hw;
- }
+ if (gpadc->irq_hw < 0)
+ return dev_err_probe(dev, gpadc->irq_hw,
+ "failed to get platform hw_conv_end irq\n");
} else {
gpadc->irq_hw = 0;
}
@@ -1146,11 +1144,9 @@ static int ab8500_gpadc_probe(struct platform_device *pdev)
/* The VTVout LDO used to power the AB8500 GPADC */
gpadc->vddadc = devm_regulator_get(dev, "vddadc");
- if (IS_ERR(gpadc->vddadc)) {
- ret = PTR_ERR(gpadc->vddadc);
- dev_err(dev, "failed to get vddadc\n");
- return ret;
- }
+ if (IS_ERR(gpadc->vddadc))
+ return dev_err_probe(dev, PTR_ERR(gpadc->vddadc),
+ "failed to get vddadc\n");
ret = regulator_enable(gpadc->vddadc);
if (ret) {
--
2.25.1
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 <[email protected]>
---
drivers/iio/adc/ti-ads7950.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/iio/adc/ti-ads7950.c b/drivers/iio/adc/ti-ads7950.c
index a2b83f0bd526..a7efa3eada2c 100644
--- a/drivers/iio/adc/ti-ads7950.c
+++ b/drivers/iio/adc/ti-ads7950.c
@@ -600,8 +600,8 @@ static int ti_ads7950_probe(struct spi_device *spi)
st->reg = devm_regulator_get(&spi->dev, "vref");
if (IS_ERR(st->reg)) {
- dev_err(&spi->dev, "Failed to get regulator \"vref\"\n");
- ret = PTR_ERR(st->reg);
+ ret = dev_err_probe(&spi->dev, PTR_ERR(st->reg),
+ "Failed to get regulator \"vref\"\n");
goto error_destroy_mutex;
}
--
2.25.1
On Fri, 8 Oct 2021 17:28:49 +0800
Cai Huoqing <[email protected]> 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 <[email protected]>
Hi Cai,
Series applied to the iio-togreg branch of iio.git and pushed out as testing
for 0-day to poke at it and see if it can find any problems we missed.
Thanks,
Jonathan
> ---
> v1->v2: Remove the separate line of PTR_ERR().
> v2: Reviewed-by: Linus Walleij <[email protected]>
>
> v2->v3: Handle platform_get_irq_byname() that returns -EPROBE_DEFER.
>
> drivers/iio/adc/ab8500-gpadc.c | 22 +++++++++-------------
> 1 file changed, 9 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/iio/adc/ab8500-gpadc.c b/drivers/iio/adc/ab8500-gpadc.c
> index 7b5212ba5501..4c46a201d4ef 100644
> --- a/drivers/iio/adc/ab8500-gpadc.c
> +++ b/drivers/iio/adc/ab8500-gpadc.c
> @@ -1103,17 +1103,15 @@ static int ab8500_gpadc_probe(struct platform_device *pdev)
> return ret;
>
> gpadc->irq_sw = platform_get_irq_byname(pdev, "SW_CONV_END");
> - if (gpadc->irq_sw < 0) {
> - dev_err(dev, "failed to get platform sw_conv_end irq\n");
> - return gpadc->irq_sw;
> - }
> + if (gpadc->irq_sw < 0)
> + return dev_err_probe(dev, gpadc->irq_sw,
> + "failed to get platform sw_conv_end irq\n");
>
> if (is_ab8500(gpadc->ab8500)) {
> gpadc->irq_hw = platform_get_irq_byname(pdev, "HW_CONV_END");
> - if (gpadc->irq_hw < 0) {
> - dev_err(dev, "failed to get platform hw_conv_end irq\n");
> - return gpadc->irq_hw;
> - }
> + if (gpadc->irq_hw < 0)
> + return dev_err_probe(dev, gpadc->irq_hw,
> + "failed to get platform hw_conv_end irq\n");
> } else {
> gpadc->irq_hw = 0;
> }
> @@ -1146,11 +1144,9 @@ static int ab8500_gpadc_probe(struct platform_device *pdev)
>
> /* The VTVout LDO used to power the AB8500 GPADC */
> gpadc->vddadc = devm_regulator_get(dev, "vddadc");
> - if (IS_ERR(gpadc->vddadc)) {
> - ret = PTR_ERR(gpadc->vddadc);
> - dev_err(dev, "failed to get vddadc\n");
> - return ret;
> - }
> + if (IS_ERR(gpadc->vddadc))
> + return dev_err_probe(dev, PTR_ERR(gpadc->vddadc),
> + "failed to get vddadc\n");
>
> ret = regulator_enable(gpadc->vddadc);
> if (ret) {