Commit 58c24400 authored by Igor Grinberg's avatar Igor Grinberg Committed by Dmitry Torokhov

Input: ads7846 - cleanup GPIO initialization

Use gpio_request_one() instead of multiple gpiolib calls.
This also simplifies error handling a bit.
Signed-off-by: default avatarIgor Grinberg <grinberg@compulab.co.il>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 11d0cf88
...@@ -967,17 +967,12 @@ static int __devinit ads7846_setup_pendown(struct spi_device *spi, struct ads784 ...@@ -967,17 +967,12 @@ static int __devinit ads7846_setup_pendown(struct spi_device *spi, struct ads784
ts->get_pendown_state = pdata->get_pendown_state; ts->get_pendown_state = pdata->get_pendown_state;
} else if (gpio_is_valid(pdata->gpio_pendown)) { } else if (gpio_is_valid(pdata->gpio_pendown)) {
err = gpio_request(pdata->gpio_pendown, "ads7846_pendown"); err = gpio_request_one(pdata->gpio_pendown, GPIOF_IN,
"ads7846_pendown");
if (err) { if (err) {
dev_err(&spi->dev, "failed to request pendown GPIO%d\n", dev_err(&spi->dev,
pdata->gpio_pendown); "failed to request/setup pendown GPIO%d: %d\n",
return err; pdata->gpio_pendown, err);
}
err = gpio_direction_input(pdata->gpio_pendown);
if (err) {
dev_err(&spi->dev, "failed to setup pendown GPIO%d\n",
pdata->gpio_pendown);
gpio_free(pdata->gpio_pendown);
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment