Commit f451e76f authored Jun 08, 2015 by Uwe Kleine-König Committed by Sebastian Reichel Jun 23, 2015

HSI: nokia-modem: use flags argument of devm_gpiod_get to set direction

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 output.

Use this to simplify the driver. Furthermore this is one caller less
that stops us making the flags argument to gpiod_get*() mandatory.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>

parent 505875e1

drivers/hsi/clients/nokia-modem.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -112,7 +112,8 @@ static int nokia_modem_gpio_probe(struct device *dev)
		modem->gpio_amount = gpio_count;

		for (i = 0; i < gpio_count; i++) {
		modem->gpios[i].gpio = devm_gpiod_get_index(dev, NULL, i);
		modem->gpios[i].gpio = devm_gpiod_get_index(dev, NULL, i,
		GPIOD_OUT_LOW);
		if (IS_ERR(modem->gpios[i].gpio)) {
		dev_err(dev, "Could not get gpio %d\n", i);
		return PTR_ERR(modem->gpios[i].gpio);
		@@ -125,10 +126,6 @@ static int nokia_modem_gpio_probe(struct device *dev)
		return err;
		}

		err = gpiod_direction_output(modem->gpios[i].gpio, 0);
		if (err)
		return err;

		err = gpiod_export(modem->gpios[i].gpio, 0);
		if (err)
		return err;