This saves us a few lines of code.

Signed-off-by: Dmitry Torokhov <dmitry.torok...@gmail.com>
---
 drivers/input/keyboard/gpio_keys.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/drivers/input/keyboard/gpio_keys.c 
b/drivers/input/keyboard/gpio_keys.c
index 79435de..d327f5a 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);
-- 
1.7.11.7


-- 
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to