diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2015-02-18 07:47:11 -0500 |
---|---|---|
committer | Jonathan Cameron <jic23@kernel.org> | 2015-02-22 04:49:22 -0500 |
commit | b457f53a2afa7de3cecdec1772fbd522b98afc49 (patch) | |
tree | 28998a43fc28d1a630f3dd24d3618a7a4741929b /drivers/iio/proximity | |
parent | 1a179a14d152467da7038205af52883f38973afe (diff) |
iio: improve usage of gpiod API
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
outputs.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Alexandre Courbot <acourbot@nvidia.com>
Reviewed-by: Daniel Baluta <daniel.baluta@intel.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio/proximity')
-rw-r--r-- | drivers/iio/proximity/sx9500.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/iio/proximity/sx9500.c b/drivers/iio/proximity/sx9500.c index 74dff4e4a11a..0b4d79490b05 100644 --- a/drivers/iio/proximity/sx9500.c +++ b/drivers/iio/proximity/sx9500.c | |||
@@ -618,16 +618,12 @@ static int sx9500_gpio_probe(struct i2c_client *client, | |||
618 | dev = &client->dev; | 618 | dev = &client->dev; |
619 | 619 | ||
620 | /* data ready gpio interrupt pin */ | 620 | /* data ready gpio interrupt pin */ |
621 | gpio = devm_gpiod_get_index(dev, SX9500_GPIO_NAME, 0); | 621 | gpio = devm_gpiod_get_index(dev, SX9500_GPIO_NAME, 0, GPIOD_IN); |
622 | if (IS_ERR(gpio)) { | 622 | if (IS_ERR(gpio)) { |
623 | dev_err(dev, "acpi gpio get index failed\n"); | 623 | dev_err(dev, "acpi gpio get index failed\n"); |
624 | return PTR_ERR(gpio); | 624 | return PTR_ERR(gpio); |
625 | } | 625 | } |
626 | 626 | ||
627 | ret = gpiod_direction_input(gpio); | ||
628 | if (ret) | ||
629 | return ret; | ||
630 | |||
631 | ret = gpiod_to_irq(gpio); | 627 | ret = gpiod_to_irq(gpio); |
632 | 628 | ||
633 | dev_dbg(dev, "GPIO resource, no:%d irq:%d\n", desc_to_gpio(gpio), ret); | 629 | dev_dbg(dev, "GPIO resource, no:%d irq:%d\n", desc_to_gpio(gpio), ret); |