aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2015-06-08 05:53:45 -0400
committerSebastian Reichel <sre@kernel.org>2015-06-22 20:40:03 -0400
commitf451e76f896922137f8316cb071ae2cab78091ad (patch)
tree5eca36b50486b7748237b99ca4d06965877b2825
parent505875e12a6c3bf08f333d1dba59e5e14f883c05 (diff)
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>
-rw-r--r--drivers/hsi/clients/nokia-modem.c7
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)
112 modem->gpio_amount = gpio_count; 112 modem->gpio_amount = gpio_count;
113 113
114 for (i = 0; i < gpio_count; i++) { 114 for (i = 0; i < gpio_count; i++) {
115 modem->gpios[i].gpio = devm_gpiod_get_index(dev, NULL, i); 115 modem->gpios[i].gpio = devm_gpiod_get_index(dev, NULL, i,
116 GPIOD_OUT_LOW);
116 if (IS_ERR(modem->gpios[i].gpio)) { 117 if (IS_ERR(modem->gpios[i].gpio)) {
117 dev_err(dev, "Could not get gpio %d\n", i); 118 dev_err(dev, "Could not get gpio %d\n", i);
118 return PTR_ERR(modem->gpios[i].gpio); 119 return PTR_ERR(modem->gpios[i].gpio);
@@ -125,10 +126,6 @@ static int nokia_modem_gpio_probe(struct device *dev)
125 return err; 126 return err;
126 } 127 }
127 128
128 err = gpiod_direction_output(modem->gpios[i].gpio, 0);
129 if (err)
130 return err;
131
132 err = gpiod_export(modem->gpios[i].gpio, 0); 129 err = gpiod_export(modem->gpios[i].gpio, 0);
133 if (err) 130 if (err)
134 return err; 131 return err;