Skip to content

Commit

Permalink
Input: sis_i2c - simplify with dev_err_probe()
Browse files Browse the repository at this point in the history
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 <krzysztof.kozlowski@linaro.org>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20230625162817.100397-20-krzysztof.kozlowski@linaro.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
  • Loading branch information
Krzysztof Kozlowski authored and Dmitry Torokhov committed Jul 7, 2023
1 parent 21142c1 commit d3aeb44
Showing 1 changed file with 6 additions and 14 deletions.
20 changes: 6 additions & 14 deletions drivers/input/touchscreen/sis_i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -310,23 +310,15 @@ static int sis_ts_probe(struct i2c_client *client)

ts->attn_gpio = devm_gpiod_get_optional(&client->dev,
"attn", GPIOD_IN);
if (IS_ERR(ts->attn_gpio)) {
error = PTR_ERR(ts->attn_gpio);
if (error != -EPROBE_DEFER)
dev_err(&client->dev,
"Failed to get attention GPIO: %d\n", error);
return error;
}
if (IS_ERR(ts->attn_gpio))
return dev_err_probe(&client->dev, PTR_ERR(ts->attn_gpio),
"Failed to get attention GPIO\n");

ts->reset_gpio = devm_gpiod_get_optional(&client->dev,
"reset", GPIOD_OUT_LOW);
if (IS_ERR(ts->reset_gpio)) {
error = PTR_ERR(ts->reset_gpio);
if (error != -EPROBE_DEFER)
dev_err(&client->dev,
"Failed to get reset GPIO: %d\n", error);
return error;
}
if (IS_ERR(ts->reset_gpio))
return dev_err_probe(&client->dev, PTR_ERR(ts->reset_gpio),
"Failed to get reset GPIO\n");

sis_ts_reset(ts);

Expand Down

0 comments on commit d3aeb44

Please sign in to comment.