openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: smc91x: make use of 4th parameter to devm_gpiod_get_index 

Since 39b2bbe3d7 (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>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Uwe Kleine-König 2015-03-26 22:26:08 +01:00 committed by David S. Miller
parent 7c3877f275
commit cb6e0b3690
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/net/ethernet/smsc/smc91x.c
View File

@ -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;