From: Stephen Rothwell Date: Mon, 10 Aug 2015 05:37:46 +0000 (-0700) Subject: Input: elants_i2c - fix for devm_gpiod_get API change X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7229b87bb269c9e18cabbc43c5fb01c81d097b24;p=openwrt%2Fstaging%2Fblogic.git Input: elants_i2c - fix for devm_gpiod_get API change 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 [Dmitry: GPIOD_ASIS -> GPIOD_OUT_LOW] Signed-off-by: Dmitry Torokhov --- diff --git a/drivers/input/touchscreen/elants_i2c.c b/drivers/input/touchscreen/elants_i2c.c index 6f7155641591..ddac134b25b1 100644 --- a/drivers/input/touchscreen/elants_i2c.c +++ b/drivers/input/touchscreen/elants_i2c.c @@ -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);