hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Input: improve usage of gpiod API 

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 drivers accordingly.

Note that in the case of the drv260x driver error checking is more
strict now because -ENOSYS is reported to the caller now. But this
should only be returned if GPIOLIB is disabled which shouldn't happen as
the driver depends on GPIOLIB.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Uwe Kleine-König 2015-06-16 17:02:13 -07:00 committed by Dmitry Torokhov
parent eeb64c1427
commit ea0afac450
3 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/input/keyboard/clps711x-keypad.c
View File

@ -120,14 +120,9 @@ static int clps711x_keypad_probe(struct platform_device *pdev)
for (i = 0; i < priv->row_count; i++) { for (i = 0; i < priv->row_count; i++) {
struct clps711x_gpio_data *data = &priv->gpio_data[i]; struct clps711x_gpio_data *data = &priv->gpio_data[i];
data->desc = devm_gpiod_get_index(dev, "row", i); data->desc = devm_gpiod_get_index(dev, "row", i, GPIOD_IN);
if (!data->desc)
return -EINVAL;
if (IS_ERR(data->desc)) if (IS_ERR(data->desc))
return PTR_ERR(data->desc); return PTR_ERR(data->desc);
gpiod_direction_input(data->desc);
} }
err = of_property_read_u32(np, "poll-interval", &poll_interval); err = of_property_read_u32(np, "poll-interval", &poll_interval);

13
drivers/input/misc/drv260x.c
View File

@ -580,15 +580,10 @@ static int drv260x_probe(struct i2c_client *client,
return error; return error;
} }
haptics->enable_gpio = devm_gpiod_get(&client->dev, "enable"); haptics->enable_gpio = devm_gpiod_get_optional(&client->dev, "enable",
if (IS_ERR(haptics->enable_gpio)) { GPIOD_OUT_HIGH);
error = PTR_ERR(haptics->enable_gpio); if (IS_ERR(haptics->enable_gpio))
if (error != -ENOENT && error != -ENOSYS) return PTR_ERR(haptics->enable_gpio);
return error;
haptics->enable_gpio = NULL;
} else {
gpiod_direction_output(haptics->enable_gpio, 1);
}
haptics->input_dev = devm_input_allocate_device(&client->dev); haptics->input_dev = devm_input_allocate_device(&client->dev);
if (!haptics->input_dev) { if (!haptics->input_dev) {

7
drivers/input/misc/gpio-beeper.c
View File

@ -66,13 +66,12 @@ static int gpio_beeper_probe(struct platform_device *pdev)
{ {
struct gpio_beeper *beep; struct gpio_beeper *beep;
struct input_dev *input; struct input_dev *input;
int err;
beep = devm_kzalloc(&pdev->dev, sizeof(*beep), GFP_KERNEL); beep = devm_kzalloc(&pdev->dev, sizeof(*beep), GFP_KERNEL);
if (!beep) if (!beep)
return -ENOMEM; return -ENOMEM;
beep->desc = devm_gpiod_get(&pdev->dev, NULL); beep->desc = devm_gpiod_get(&pdev->dev, NULL, GPIOD_OUT_LOW);
if (IS_ERR(beep->desc)) if (IS_ERR(beep->desc))
return PTR_ERR(beep->desc); return PTR_ERR(beep->desc);
@ -92,10 +91,6 @@ static int gpio_beeper_probe(struct platform_device *pdev)
input_set_capability(input, EV_SND, SND_BELL); input_set_capability(input, EV_SND, SND_BELL);
err = gpiod_direction_output(beep->desc, 0);
if (err)
return err;
input_set_drvdata(input, beep); input_set_drvdata(input, beep);
return input_register_device(input); return input_register_device(input);