| Message ID | 20200826181706.11098-11-krzk@kernel.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [01/24] Input: bcm-keypad - Simplify with dev_err_probe() | expand |
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/chipone_icn8318.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/drivers/input/touchscreen/chipone_icn8318.c b/drivers/input/touchscreen/chipone_icn8318.c > index d91d2fd78649..5bee007184c4 100644 > --- a/drivers/input/touchscreen/chipone_icn8318.c > +++ b/drivers/input/touchscreen/chipone_icn8318.c > @@ -194,12 +194,8 @@ static int icn8318_probe(struct i2c_client *client, > return -ENOMEM; > > data->wake_gpio = devm_gpiod_get(dev, "wake", GPIOD_OUT_LOW); > - if (IS_ERR(data->wake_gpio)) { > - error = PTR_ERR(data->wake_gpio); > - if (error != -EPROBE_DEFER) > - dev_err(dev, "Error getting wake gpio: %d\n", error); > - return error; > - } > + if (IS_ERR(data->wake_gpio)) > + return dev_err_probe(dev, PTR_ERR(data->wake_gpio), "Error getting wake gpio\n"); > > input = devm_input_allocate_device(dev); > if (!input) > -- > 2.17.1 >
diff --git a/drivers/input/touchscreen/chipone_icn8318.c b/drivers/input/touchscreen/chipone_icn8318.c index d91d2fd78649..5bee007184c4 100644 --- a/drivers/input/touchscreen/chipone_icn8318.c +++ b/drivers/input/touchscreen/chipone_icn8318.c @@ -194,12 +194,8 @@ static int icn8318_probe(struct i2c_client *client, return -ENOMEM; data->wake_gpio = devm_gpiod_get(dev, "wake", GPIOD_OUT_LOW); - if (IS_ERR(data->wake_gpio)) { - error = PTR_ERR(data->wake_gpio); - if (error != -EPROBE_DEFER) - dev_err(dev, "Error getting wake gpio: %d\n", error); - return error; - } + if (IS_ERR(data->wake_gpio)) + return dev_err_probe(dev, PTR_ERR(data->wake_gpio), "Error getting wake gpio\n"); input = devm_input_allocate_device(dev); if (!input)
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/input/touchscreen/chipone_icn8318.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)