diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-11-29 18:24:08 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-12-04 06:25:11 +0100 |
| commit | da5ee074ce8e07b9a91596de3576b59990c0c8c6 (patch) | |
| tree | adbe068e9e42f1b57b1c9962173a6219c6985dff /drivers/input | |
| parent | Input: gpio_keys - switch to using gpio_request_one() (diff) | |
| download | linux-da5ee074ce8e07b9a91596de3576b59990c0c8c6.tar.xz linux-da5ee074ce8e07b9a91596de3576b59990c0c8c6.zip | |
Input: gpio_keys_polled - switch to using gpio_request_one()
This saves us a few lines of code.
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/keyboard/gpio_keys_polled.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c index d72d0e5ebb85..f686fd970553 100644 --- a/drivers/input/keyboard/gpio_keys_polled.c +++ b/drivers/input/keyboard/gpio_keys_polled.c @@ -270,22 +270,14 @@ static int gpio_keys_polled_probe(struct platform_device *pdev) goto err_free_gpio; } - error = gpio_request(gpio, - button->desc ? button->desc : DRV_NAME); + error = gpio_request_one(gpio, GPIOF_IN, + button->desc ?: DRV_NAME); if (error) { dev_err(dev, "unable to claim gpio %u, err=%d\n", gpio, error); goto err_free_gpio; } - error = gpio_direction_input(gpio); - if (error) { - dev_err(dev, - "unable to set direction on gpio %u, err=%d\n", - gpio, error); - goto err_free_gpio; - } - bdata->can_sleep = gpio_cansleep(gpio); bdata->last_state = -1; bdata->threshold = DIV_ROUND_UP(button->debounce_interval, |