diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-11-29 09:00:19 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-12-03 21:25:06 -0800 |
| commit | 333e34bfe2149e634fb0613b4936fd838c36fafb (patch) | |
| tree | c8de3cc15d1b6245edc977085253b71f861f895d /drivers/input/keyboard | |
| parent | 1a22e16fc3d6abc8d6323cc0973435439932fe5f (diff) | |
| download | talos-op-linux-333e34bfe2149e634fb0613b4936fd838c36fafb.tar.gz talos-op-linux-333e34bfe2149e634fb0613b4936fd838c36fafb.zip | |
Input: gpio_keys - 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/keyboard')
| -rw-r--r-- | drivers/input/keyboard/gpio_keys.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c index 79435de0caa8..d327f5a2bb0e 100644 --- a/drivers/input/keyboard/gpio_keys.c +++ b/drivers/input/keyboard/gpio_keys.c @@ -440,21 +440,13 @@ static int gpio_keys_setup_key(struct platform_device *pdev, if (gpio_is_valid(button->gpio)) { - error = gpio_request(button->gpio, desc); + error = gpio_request_one(button->gpio, GPIOF_IN, desc); if (error < 0) { dev_err(dev, "Failed to request GPIO %d, error %d\n", button->gpio, error); return error; } - error = gpio_direction_input(button->gpio); - if (error < 0) { - dev_err(dev, - "Failed to configure direction for GPIO %d, error %d\n", - button->gpio, error); - goto fail; - } - if (button->debounce_interval) { error = gpio_set_debounce(button->gpio, button->debounce_interval * 1000); |
