| Message ID | 20200827192642.1725-12-krzk@kernel.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2,01/18] iio: accel: bma180: Simplify with dev_err_probe() | expand |
On Thu, Aug 27, 2020 at 10:28 PM Krzysztof Kozlowski <krzk@kernel.org> wrote: > > Common pattern of handling deferred probe can be simplified with > dev_err_probe(). Less code and also it prints the error value. Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> > --- > drivers/iio/dac/dpot-dac.c | 16 ++++++---------- > 1 file changed, 6 insertions(+), 10 deletions(-) > > diff --git a/drivers/iio/dac/dpot-dac.c b/drivers/iio/dac/dpot-dac.c > index be61c3b01e8b..2258535b8a42 100644 > --- a/drivers/iio/dac/dpot-dac.c > +++ b/drivers/iio/dac/dpot-dac.c > @@ -183,18 +183,14 @@ static int dpot_dac_probe(struct platform_device *pdev) > indio_dev->num_channels = 1; > > dac->vref = devm_regulator_get(dev, "vref"); > - if (IS_ERR(dac->vref)) { > - if (PTR_ERR(dac->vref) != -EPROBE_DEFER) > - dev_err(&pdev->dev, "failed to get vref regulator\n"); > - return PTR_ERR(dac->vref); > - } > + if (IS_ERR(dac->vref)) > + return dev_err_probe(&pdev->dev, PTR_ERR(dac->vref), > + "failed to get vref regulator\n"); > > dac->dpot = devm_iio_channel_get(dev, "dpot"); > - if (IS_ERR(dac->dpot)) { > - if (PTR_ERR(dac->dpot) != -EPROBE_DEFER) > - dev_err(dev, "failed to get dpot input channel\n"); > - return PTR_ERR(dac->dpot); > - } > + if (IS_ERR(dac->dpot)) > + return dev_err_probe(&pdev->dev, PTR_ERR(dac->dpot), > + "failed to get dpot input channel\n"); > > ret = iio_get_channel_type(dac->dpot, &type); > if (ret < 0) > -- > 2.17.1 >
diff --git a/drivers/iio/dac/dpot-dac.c b/drivers/iio/dac/dpot-dac.c index be61c3b01e8b..2258535b8a42 100644 --- a/drivers/iio/dac/dpot-dac.c +++ b/drivers/iio/dac/dpot-dac.c @@ -183,18 +183,14 @@ static int dpot_dac_probe(struct platform_device *pdev) indio_dev->num_channels = 1; dac->vref = devm_regulator_get(dev, "vref"); - if (IS_ERR(dac->vref)) { - if (PTR_ERR(dac->vref) != -EPROBE_DEFER) - dev_err(&pdev->dev, "failed to get vref regulator\n"); - return PTR_ERR(dac->vref); - } + if (IS_ERR(dac->vref)) + return dev_err_probe(&pdev->dev, PTR_ERR(dac->vref), + "failed to get vref regulator\n"); dac->dpot = devm_iio_channel_get(dev, "dpot"); - if (IS_ERR(dac->dpot)) { - if (PTR_ERR(dac->dpot) != -EPROBE_DEFER) - dev_err(dev, "failed to get dpot input channel\n"); - return PTR_ERR(dac->dpot); - } + if (IS_ERR(dac->dpot)) + return dev_err_probe(&pdev->dev, PTR_ERR(dac->dpot), + "failed to get dpot input channel\n"); ret = iio_get_channel_type(dac->dpot, &type); if (ret < 0)
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/dac/dpot-dac.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)