Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/input/touchscreen/ads7846.c

+5 −10
Original line number Diff line number Diff line
@@ -967,17 +967,12 @@ static int __devinit ads7846_setup_pendown(struct spi_device *spi, struct ads784 
		ts->get_pendown_state = pdata->get_pendown_state;

	} 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) {

			dev_err(&spi->dev, "failed to request pendown GPIO%d\n",

				pdata->gpio_pendown);

			return 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);

			dev_err(&spi->dev,

				"failed to request/setup pendown GPIO%d: %d\n",

				pdata->gpio_pendown, err);

			return err;

		}