* [PATCH] net: smc91x: make use of 4th parameter to devm_gpiod_get_index
@ 2015-03-26 21:26 Uwe Kleine-König
2015-03-29 20:06 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Uwe Kleine-König @ 2015-03-26 21:26 UTC (permalink / raw)
To: Nicolas Pitre
Cc: Linus Walleij, Tony Lindgren, netdev, kernel, Alexandre Courbot
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.
Simplify accordingly.
Moreover use devm_gpiod_get_index_optional for still simpler handling.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
drivers/net/ethernet/smsc/smc91x.c | 25 ++++++++-----------------
1 file changed, 8 insertions(+), 17 deletions(-)
diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c
index 8678e39aba08..5a1a3e7c93e7 100644
--- a/drivers/net/ethernet/smsc/smc91x.c
+++ b/drivers/net/ethernet/smsc/smc91x.c
@@ -2204,27 +2204,18 @@ static int try_toggle_control_gpio(struct device *dev,
int value, unsigned int nsdelay)
{
struct gpio_desc *gpio = *desc;
+ enum gpiod_flags flags = value ? GPIOD_OUT_LOW : GPIOD_OUT_HIGH;
int res;
- gpio = devm_gpiod_get_index(dev, name, index);
- if (IS_ERR(gpio)) {
- if (PTR_ERR(gpio) == -ENOENT) {
- *desc = NULL;
- return 0;
- }
-
+ gpio = devm_gpiod_get_index_optional(dev, name, index, flags);
+ if (IS_ERR(gpio))
return PTR_ERR(gpio);
+
+ if (gpio) {
+ if (nsdelay)
+ usleep_range(nsdelay, 2 * nsdelay);
+ gpiod_set_value_cansleep(gpio, value);
}
- res = gpiod_direction_output(gpio, !value);
- if (res) {
- dev_err(dev, "unable to toggle gpio %s: %i\n", name, res);
- devm_gpiod_put(dev, gpio);
- gpio = NULL;
- return res;
- }
- if (nsdelay)
- usleep_range(nsdelay, 2 * nsdelay);
- gpiod_set_value_cansleep(gpio, value);
*desc = gpio;
return 0;
--
2.1.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] net: smc91x: make use of 4th parameter to devm_gpiod_get_index
2015-03-26 21:26 [PATCH] net: smc91x: make use of 4th parameter to devm_gpiod_get_index Uwe Kleine-König
@ 2015-03-29 20:06 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2015-03-29 20:06 UTC (permalink / raw)
To: u.kleine-koenig; +Cc: nico, linus.walleij, tony, netdev, kernel, acourbot
From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Thu, 26 Mar 2015 22:26:08 +0100
> 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.
> Simplify accordingly.
>
> Moreover use devm_gpiod_get_index_optional for still simpler handling.
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Applied to net-next, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-03-29 19:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-26 21:26 [PATCH] net: smc91x: make use of 4th parameter to devm_gpiod_get_index Uwe Kleine-König
2015-03-29 20:06 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).