]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Input: elants_i2c - fix for devm_gpiod_get API change
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Aug 2015 05:37:46 +0000 (22:37 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 13 Aug 2015 23:05:02 +0000 (16:05 -0700)
Flags are now mandatory for devm_gpiod_get(). So let's use proper flag
to configure gpio for output instead of doing this by hand.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
[Dmitry: GPIOD_ASIS -> GPIOD_OUT_LOW]
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/touchscreen/elants_i2c.c

index 6f7155641591b41c7484b700eb43e174232b5797..ddac134b25b108841e7e7797003fe9a6725e4576 100644 (file)
@@ -1173,7 +1173,7 @@ static int elants_i2c_probe(struct i2c_client *client,
                return error;
        }
 
-       ts->reset_gpio = devm_gpiod_get(&client->dev, "reset");
+       ts->reset_gpio = devm_gpiod_get(&client->dev, "reset", GPIOD_OUT_LOW);
        if (IS_ERR(ts->reset_gpio)) {
                error = PTR_ERR(ts->reset_gpio);
 
@@ -1188,14 +1188,6 @@ static int elants_i2c_probe(struct i2c_client *client,
                }
 
                ts->keep_power_in_suspend = true;
-       } else {
-               error = gpiod_direction_output(ts->reset_gpio, 0);
-               if (error) {
-                       dev_err(&client->dev,
-                               "failed to configure reset gpio as output: %d\n",
-                               error);
-                       return error;
-               }
        }
 
        error = elants_i2c_power_on(ts);