| Message ID | 20200826181706.11098-24-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> Just in case if you want to save more LOCs, you may in some drivers introduce temporary variable for device pointer, like struct device *dev = &client->dev; > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> > --- > drivers/input/touchscreen/sx8654.c | 10 +++------- > 1 file changed, 3 insertions(+), 7 deletions(-) > > diff --git a/drivers/input/touchscreen/sx8654.c b/drivers/input/touchscreen/sx8654.c > index de85e57b2486..d2ed9be64c3a 100644 > --- a/drivers/input/touchscreen/sx8654.c > +++ b/drivers/input/touchscreen/sx8654.c > @@ -323,13 +323,9 @@ static int sx8654_probe(struct i2c_client *client, > > sx8654->gpio_reset = devm_gpiod_get_optional(&client->dev, "reset", > GPIOD_OUT_HIGH); > - if (IS_ERR(sx8654->gpio_reset)) { > - error = PTR_ERR(sx8654->gpio_reset); > - if (error != -EPROBE_DEFER) > - dev_err(&client->dev, "unable to get reset-gpio: %d\n", > - error); > - return error; > - } > + if (IS_ERR(sx8654->gpio_reset)) > + return dev_err_probe(&client->dev, PTR_ERR(sx8654->gpio_reset), > + "unable to get reset-gpio\n"); > dev_dbg(&client->dev, "got GPIO reset pin\n"); > > sx8654->data = device_get_match_data(&client->dev); > -- > 2.17.1 >
diff --git a/drivers/input/touchscreen/sx8654.c b/drivers/input/touchscreen/sx8654.c index de85e57b2486..d2ed9be64c3a 100644 --- a/drivers/input/touchscreen/sx8654.c +++ b/drivers/input/touchscreen/sx8654.c @@ -323,13 +323,9 @@ static int sx8654_probe(struct i2c_client *client, sx8654->gpio_reset = devm_gpiod_get_optional(&client->dev, "reset", GPIOD_OUT_HIGH); - if (IS_ERR(sx8654->gpio_reset)) { - error = PTR_ERR(sx8654->gpio_reset); - if (error != -EPROBE_DEFER) - dev_err(&client->dev, "unable to get reset-gpio: %d\n", - error); - return error; - } + if (IS_ERR(sx8654->gpio_reset)) + return dev_err_probe(&client->dev, PTR_ERR(sx8654->gpio_reset), + "unable to get reset-gpio\n"); dev_dbg(&client->dev, "got GPIO reset pin\n"); sx8654->data = device_get_match_data(&client->dev);
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/sx8654.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)