Re: [PATCH 18/24] Input: pixcir_i2c_ts - Simplify with dev_err_probe()

Andy Shevchenko
2020-08-27T09:15:40Z

On Wed, Aug 26, 2020 at 9:21 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/input/touchscreen/pixcir_i2c_ts.c | 38 +++++++----------------
> 1 file changed, 12 insertions(+), 26 deletions(-)
>
> diff --git a/drivers/input/touchscreen/pixcir_i2c_ts.c b/drivers/input/touchscreen/pixcir_i2c_ts.c
> index 9aa098577350..fb37567e2d7e 100644
> --- a/drivers/input/touchscreen/pixcir_i2c_ts.c
> +++ b/drivers/input/touchscreen/pixcir_i2c_ts.c
> @@ -515,41 +515,27 @@ static int pixcir_i2c_ts_probe(struct i2c_client *client,
> input_set_drvdata(input, tsdata);
>
> tsdata->gpio_attb = devm_gpiod_get(dev, "attb", GPIOD_IN);
> - if (IS_ERR(tsdata->gpio_attb)) {
> - error = PTR_ERR(tsdata->gpio_attb);
> - if (error != -EPROBE_DEFER)
> - dev_err(dev, "Failed to request ATTB gpio: %d\n",
> - error);
> - return error;
> - }
> + if (IS_ERR(tsdata->gpio_attb))
> + return dev_err_probe(dev, PTR_ERR(tsdata->gpio_attb),
> + "Failed to request ATTB gpio\n");
>
> tsdata->gpio_reset = devm_gpiod_get_optional(dev, "reset",
> GPIOD_OUT_LOW);
> - if (IS_ERR(tsdata->gpio_reset)) {
> - error = PTR_ERR(tsdata->gpio_reset);
> - if (error != -EPROBE_DEFER)
> - dev_err(dev, "Failed to request RESET gpio: %d\n",
> - error);
> - return error;
> - }
> + if (IS_ERR(tsdata->gpio_reset))
> + return dev_err_probe(dev, PTR_ERR(tsdata->gpio_reset),
> + "Failed to request RESET gpio\n");
>
> tsdata->gpio_wake = devm_gpiod_get_optional(dev, "wake",
> GPIOD_OUT_HIGH);
> - if (IS_ERR(tsdata->gpio_wake)) {
> - error = PTR_ERR(tsdata->gpio_wake);
> - if (error != -EPROBE_DEFER)
> - dev_err(dev, "Failed to get wake gpio: %d\n", error);
> - return error;
> - }
> + if (IS_ERR(tsdata->gpio_wake))
> + return dev_err_probe(dev, PTR_ERR(tsdata->gpio_wake),
> + "Failed to get wake gpio\n");
>
> tsdata->gpio_enable = devm_gpiod_get_optional(dev, "enable",
> GPIOD_OUT_HIGH);
> - if (IS_ERR(tsdata->gpio_enable)) {
> - error = PTR_ERR(tsdata->gpio_enable);
> - if (error != -EPROBE_DEFER)
> - dev_err(dev, "Failed to get enable gpio: %d\n", error);
> - return error;
> - }
> + if (IS_ERR(tsdata->gpio_enable))
> + return dev_err_probe(dev, PTR_ERR(tsdata->gpio_enable),
> + "Failed to get enable gpio\n");
>
> if (tsdata->gpio_enable)
> msleep(100);
> --
> 2.17.1
>

--
With Best Regards,
Andy Shevchenko