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

Commit b457f53a authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Jonathan Cameron
Browse files

iio: improve usage of gpiod API 



Since 39b2bbe3 (gpio: add flags argument to gpiod_get*() functions)
which appeared in v3.17-rc1, the gpiod_get* functions take an additional
parameter that allows to specify direction and initial value for
outputs.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Reviewed-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
Reviewed-by: default avatarDaniel Baluta <daniel.baluta@intel.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 1a179a14

drivers/iio/accel/bmc150-accel.c

+1 −5
Original line number Diff line number Diff line
@@ -1125,16 +1125,12 @@ static int bmc150_accel_gpio_probe(struct i2c_client *client, 
	dev = &client->dev;



	/* data ready gpio interrupt pin */

	gpio = devm_gpiod_get_index(dev, BMC150_ACCEL_GPIO_NAME, 0);

	gpio = devm_gpiod_get_index(dev, BMC150_ACCEL_GPIO_NAME, 0, GPIOD_IN);

	if (IS_ERR(gpio)) {

		dev_err(dev, "Failed: gpio get index\n");

		return PTR_ERR(gpio);

	}



	ret = gpiod_direction_input(gpio);

	if (ret)

		return ret;



	ret = gpiod_to_irq(gpio);



	dev_dbg(dev, "GPIO resource, no:%d irq:%d\n", desc_to_gpio(gpio), ret);

drivers/iio/accel/kxcjk-1013.c

+1 −5
Original line number Diff line number Diff line
@@ -1169,16 +1169,12 @@ static int kxcjk1013_gpio_probe(struct i2c_client *client, 
	dev = &client->dev;



	/* data ready gpio interrupt pin */

	gpio = devm_gpiod_get_index(dev, "kxcjk1013_int", 0);

	gpio = devm_gpiod_get_index(dev, "kxcjk1013_int", 0, GPIOD_IN);

	if (IS_ERR(gpio)) {

		dev_err(dev, "acpi gpio get index failed\n");

		return PTR_ERR(gpio);

	}



	ret = gpiod_direction_input(gpio);

	if (ret)

		return ret;



	ret = gpiod_to_irq(gpio);



	dev_dbg(dev, "GPIO resource, no:%d irq:%d\n", desc_to_gpio(gpio), ret);

drivers/iio/accel/mma9551.c

+2 −5
Original line number Diff line number Diff line
@@ -418,16 +418,13 @@ static int mma9551_gpio_probe(struct iio_dev *indio_dev) 
	struct device *dev = &data->client->dev;



	for (i = 0; i < MMA9551_GPIO_COUNT; i++) {

		gpio = devm_gpiod_get_index(dev, MMA9551_GPIO_NAME, i);

		gpio = devm_gpiod_get_index(dev, MMA9551_GPIO_NAME, i,

					    GPIOD_IN);

		if (IS_ERR(gpio)) {

			dev_err(dev, "acpi gpio get index failed\n");

			return PTR_ERR(gpio);

		}



		ret = gpiod_direction_input(gpio);

		if (ret)

			return ret;



		data->irqs[i] = gpiod_to_irq(gpio);

		ret = devm_request_threaded_irq(dev, data->irqs[i],

				NULL, mma9551_event_handler,

drivers/iio/accel/mma9553.c

+1 −5
Original line number Diff line number Diff line
@@ -1109,16 +1109,12 @@ static int mma9553_gpio_probe(struct i2c_client *client) 
	dev = &client->dev;



	/* data ready gpio interrupt pin */

	gpio = devm_gpiod_get_index(dev, MMA9553_GPIO_NAME, 0);

	gpio = devm_gpiod_get_index(dev, MMA9553_GPIO_NAME, 0, GPIOD_IN);

	if (IS_ERR(gpio)) {

		dev_err(dev, "acpi gpio get index failed\n");

		return PTR_ERR(gpio);

	}



	ret = gpiod_direction_input(gpio);

	if (ret)

		return ret;



	ret = gpiod_to_irq(gpio);



	dev_dbg(dev, "gpio resource, no:%d irq:%d\n", desc_to_gpio(gpio), ret);

drivers/iio/gyro/bmg160.c

+1 −5
Original line number Diff line number Diff line
@@ -1001,16 +1001,12 @@ static int bmg160_gpio_probe(struct i2c_client *client, 
	dev = &client->dev;



	/* data ready gpio interrupt pin */

	gpio = devm_gpiod_get_index(dev, BMG160_GPIO_NAME, 0);

	gpio = devm_gpiod_get_index(dev, BMG160_GPIO_NAME, 0, GPIOD_IN);

	if (IS_ERR(gpio)) {

		dev_err(dev, "acpi gpio get index failed\n");

		return PTR_ERR(gpio);

	}



	ret = gpiod_direction_input(gpio);

	if (ret)

		return ret;



	ret = gpiod_to_irq(gpio);



	dev_dbg(dev, "GPIO resource, no:%d irq:%d\n", desc_to_gpio(gpio), ret);