Message ID | 20200827192642.1725-16-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:29 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> > > --- > > Changes since v1: > 1. Wrap dev_err_probe() lines at 100 character > --- > drivers/iio/magnetometer/ak8974.c | 11 ++--------- > 1 file changed, 2 insertions(+), 9 deletions(-) > > diff --git a/drivers/iio/magnetometer/ak8974.c b/drivers/iio/magnetometer/ak8974.c > index cbb44e401c0a..548c686e29d6 100644 > --- a/drivers/iio/magnetometer/ak8974.c > +++ b/drivers/iio/magnetometer/ak8974.c > @@ -843,15 +843,8 @@ static int ak8974_probe(struct i2c_client *i2c, > ret = devm_regulator_bulk_get(&i2c->dev, > ARRAY_SIZE(ak8974->regs), > ak8974->regs); > - if (ret < 0) { > - if (ret != -EPROBE_DEFER) > - dev_err(&i2c->dev, "cannot get regulators: %d\n", ret); > - else > - dev_dbg(&i2c->dev, > - "regulators unavailable, deferring probe\n"); > - > - return ret; > - } > + if (ret < 0) > + return dev_err_probe(&i2c->dev, ret, "cannot get regulators\n"); > > ret = regulator_bulk_enable(ARRAY_SIZE(ak8974->regs), ak8974->regs); > if (ret < 0) { > -- > 2.17.1 >
On Thu, Aug 27, 2020 at 9:29 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. > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> Acked-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
diff --git a/drivers/iio/magnetometer/ak8974.c b/drivers/iio/magnetometer/ak8974.c index cbb44e401c0a..548c686e29d6 100644 --- a/drivers/iio/magnetometer/ak8974.c +++ b/drivers/iio/magnetometer/ak8974.c @@ -843,15 +843,8 @@ static int ak8974_probe(struct i2c_client *i2c, ret = devm_regulator_bulk_get(&i2c->dev, ARRAY_SIZE(ak8974->regs), ak8974->regs); - if (ret < 0) { - if (ret != -EPROBE_DEFER) - dev_err(&i2c->dev, "cannot get regulators: %d\n", ret); - else - dev_dbg(&i2c->dev, - "regulators unavailable, deferring probe\n"); - - return ret; - } + if (ret < 0) + return dev_err_probe(&i2c->dev, ret, "cannot get regulators\n"); ret = regulator_bulk_enable(ARRAY_SIZE(ak8974->regs), ak8974->regs); 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> --- Changes since v1: 1. Wrap dev_err_probe() lines at 100 character --- drivers/iio/magnetometer/ak8974.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)