| Message ID | 20200827185829.30096-8-krzk@kernel.org (mailing list archive) |
|---|---|
| State | Deferred, archived |
| Headers | show |
| Series | [v3,01/27] Input: gpio_keys_polled - Simplify with dev_err_probe() | expand |
On Thu, Aug 27, 2020 at 9:59 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> > Reviewed-by: Hans de Goede <hdegoede@redhat.com> > > --- > > Changes since v1: > 1. Remove unneeded PTR_ERR_OR_ZERO, as pointed by Andy. > --- > drivers/input/touchscreen/bu21013_ts.c | 17 ++++++----------- > 1 file changed, 6 insertions(+), 11 deletions(-) > > diff --git a/drivers/input/touchscreen/bu21013_ts.c b/drivers/input/touchscreen/bu21013_ts.c > index 2f1f0d7607f8..86bd38243d6c 100644 > --- a/drivers/input/touchscreen/bu21013_ts.c > +++ b/drivers/input/touchscreen/bu21013_ts.c > @@ -496,12 +496,10 @@ static int bu21013_probe(struct i2c_client *client, > > /* Named "CS" on the chip, DT binding is "reset" */ > ts->cs_gpiod = devm_gpiod_get(&client->dev, "reset", GPIOD_OUT_HIGH); > - error = PTR_ERR_OR_ZERO(ts->cs_gpiod); > - if (error) { > - if (error != -EPROBE_DEFER) > - dev_err(&client->dev, "failed to get CS GPIO\n"); > - return error; > - } > + if (IS_ERR(ts->cs_gpiod)) > + return dev_err_probe(&client->dev, PTR_ERR(ts->cs_gpiod), > + "failed to get CS GPIO\n"); > + > gpiod_set_consumer_name(ts->cs_gpiod, "BU21013 CS"); > > error = devm_add_action_or_reset(&client->dev, > @@ -516,11 +514,8 @@ static int bu21013_probe(struct i2c_client *client, > ts->int_gpiod = devm_gpiod_get_optional(&client->dev, > "touch", GPIOD_IN); > error = PTR_ERR_OR_ZERO(ts->int_gpiod); > - if (error) { > - if (error != -EPROBE_DEFER) > - dev_err(&client->dev, "failed to get INT GPIO\n"); > - return error; > - } > + if (error) > + return dev_err_probe(&client->dev, error, "failed to get INT GPIO\n"); > > if (ts->int_gpiod) > gpiod_set_consumer_name(ts->int_gpiod, "BU21013 INT"); > -- > 2.17.1 >
On Thu, Aug 27, 2020 at 8:59 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> > Reviewed-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
diff --git a/drivers/input/touchscreen/bu21013_ts.c b/drivers/input/touchscreen/bu21013_ts.c index 2f1f0d7607f8..86bd38243d6c 100644 --- a/drivers/input/touchscreen/bu21013_ts.c +++ b/drivers/input/touchscreen/bu21013_ts.c @@ -496,12 +496,10 @@ static int bu21013_probe(struct i2c_client *client, /* Named "CS" on the chip, DT binding is "reset" */ ts->cs_gpiod = devm_gpiod_get(&client->dev, "reset", GPIOD_OUT_HIGH); - error = PTR_ERR_OR_ZERO(ts->cs_gpiod); - if (error) { - if (error != -EPROBE_DEFER) - dev_err(&client->dev, "failed to get CS GPIO\n"); - return error; - } + if (IS_ERR(ts->cs_gpiod)) + return dev_err_probe(&client->dev, PTR_ERR(ts->cs_gpiod), + "failed to get CS GPIO\n"); + gpiod_set_consumer_name(ts->cs_gpiod, "BU21013 CS"); error = devm_add_action_or_reset(&client->dev, @@ -516,11 +514,8 @@ static int bu21013_probe(struct i2c_client *client, ts->int_gpiod = devm_gpiod_get_optional(&client->dev, "touch", GPIOD_IN); error = PTR_ERR_OR_ZERO(ts->int_gpiod); - if (error) { - if (error != -EPROBE_DEFER) - dev_err(&client->dev, "failed to get INT GPIO\n"); - return error; - } + if (error) + return dev_err_probe(&client->dev, error, "failed to get INT GPIO\n"); if (ts->int_gpiod) gpiod_set_consumer_name(ts->int_gpiod, "BU21013 INT");