diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2015-06-08 11:53:45 +0200 |
|---|---|---|
| committer | Sebastian Reichel <sre@kernel.org> | 2015-06-23 02:40:03 +0200 |
| commit | f451e76f896922137f8316cb071ae2cab78091ad (patch) | |
| tree | 5eca36b50486b7748237b99ca4d06965877b2825 /drivers/hsi | |
| parent | 505875e12a6c3bf08f333d1dba59e5e14f883c05 (diff) | |
| download | linux-f451e76f896922137f8316cb071ae2cab78091ad.tar.bz2 | |
HSI: nokia-modem: use flags argument of devm_gpiod_get to set direction
Since 39b2bbe3d715 (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>
Diffstat (limited to 'drivers/hsi')
| -rw-r--r-- | drivers/hsi/clients/nokia-modem.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/hsi/clients/nokia-modem.c b/drivers/hsi/clients/nokia-modem.c index f50d110a78cb..7f82c911ad74 100644 --- a/drivers/hsi/clients/nokia-modem.c +++ b/drivers/hsi/clients/nokia-modem.c @@ -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; |