diff mbox series

[12/24] Input: cy8ctma140 - Simplify with dev_err_probe()

Message ID 20200826181706.11098-12-krzk@kernel.org (mailing list archive)
State Superseded
Headers show
Series [01/24] Input: bcm-keypad - Simplify with dev_err_probe() | expand

Commit Message

Krzysztof Kozlowski Aug. 26, 2020, 6:16 p.m. UTC
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/cy8ctma140.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

Comments

Andy Shevchenko Aug. 27, 2020, 9:11 a.m. UTC | #1
On Wed, Aug 26, 2020 at 9:19 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/cy8ctma140.c | 8 ++------
>  1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/input/touchscreen/cy8ctma140.c b/drivers/input/touchscreen/cy8ctma140.c
> index a9be29139cbf..23da5bb00ead 100644
> --- a/drivers/input/touchscreen/cy8ctma140.c
> +++ b/drivers/input/touchscreen/cy8ctma140.c
> @@ -259,12 +259,8 @@ static int cy8ctma140_probe(struct i2c_client *client,
>         ts->regulators[1].supply = "vdd";
>         error = devm_regulator_bulk_get(dev, ARRAY_SIZE(ts->regulators),
>                                       ts->regulators);
> -       if (error) {
> -               if (error != -EPROBE_DEFER)
> -                       dev_err(dev, "Failed to get regulators %d\n",
> -                               error);
> -               return error;
> -       }
> +       if (error)
> +               return dev_err_probe(dev, error, "Failed to get regulators\n");
>
>         error = cy8ctma140_power_up(ts);
>         if (error)
> --
> 2.17.1
>
Linus Walleij Aug. 28, 2020, 2:07 p.m. UTC | #2
On Wed, Aug 26, 2020 at 8:18 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>

Acked-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij
diff mbox series

Patch

diff --git a/drivers/input/touchscreen/cy8ctma140.c b/drivers/input/touchscreen/cy8ctma140.c
index a9be29139cbf..23da5bb00ead 100644
--- a/drivers/input/touchscreen/cy8ctma140.c
+++ b/drivers/input/touchscreen/cy8ctma140.c
@@ -259,12 +259,8 @@  static int cy8ctma140_probe(struct i2c_client *client,
 	ts->regulators[1].supply = "vdd";
 	error = devm_regulator_bulk_get(dev, ARRAY_SIZE(ts->regulators),
 				      ts->regulators);
-	if (error) {
-		if (error != -EPROBE_DEFER)
-			dev_err(dev, "Failed to get regulators %d\n",
-				error);
-		return error;
-	}
+	if (error)
+		return dev_err_probe(dev, error, "Failed to get regulators\n");
 
 	error = cy8ctma140_power_up(ts);
 	if (error)