3 files changed, 6 insertions, 21 deletions

diff --git a/drivers/input/keyboard/clps711x-keypad.c b/drivers/input/keyboard/clps711x-keypad.c
index 27ef29f8fe6a..b637f1af842e 100644
--- a/drivers/input/keyboard/clps711x-keypad.c
+++ b/drivers/input/keyboard/clps711x-keypad.c
@@ -120,14 +120,9 @@ static int clps711x_keypad_probe(struct platform_device *pdev)
         for (i = 0; i < priv->row_count; i++) {
                 struct clps711x_gpio_data *data = &priv->gpio_data[i];
 
-                data->desc = devm_gpiod_get_index(dev, "row", i);
-                if (!data->desc)
-                        return -EINVAL;
-
+                data->desc = devm_gpiod_get_index(dev, "row", i, GPIOD_IN);
                 if (IS_ERR(data->desc))
                         return PTR_ERR(data->desc);
-
-                gpiod_direction_input(data->desc);
         }
 
         err = of_property_read_u32(np, "poll-interval", &poll_interval);
diff --git a/drivers/input/misc/drv260x.c b/drivers/input/misc/drv260x.c
index 599578042ea0..e5d60ecd29a4 100644
--- a/drivers/input/misc/drv260x.c
+++ b/drivers/input/misc/drv260x.c
@@ -580,15 +580,10 @@ static int drv260x_probe(struct i2c_client *client,
                 return error;
         }
 
-        haptics->enable_gpio = devm_gpiod_get(&client->dev, "enable");
-        if (IS_ERR(haptics->enable_gpio)) {
-                error = PTR_ERR(haptics->enable_gpio);
-                if (error != -ENOENT && error != -ENOSYS)
-                        return error;
-                haptics->enable_gpio = NULL;
-        } else {
-                gpiod_direction_output(haptics->enable_gpio, 1);
-        }
+        haptics->enable_gpio = devm_gpiod_get_optional(&client->dev, "enable",
+                                                       GPIOD_OUT_HIGH);
+        if (IS_ERR(haptics->enable_gpio))
+                return PTR_ERR(haptics->enable_gpio);
 
         haptics->input_dev = devm_input_allocate_device(&client->dev);
         if (!haptics->input_dev) {
diff --git a/drivers/input/misc/gpio-beeper.c b/drivers/input/misc/gpio-beeper.c
index 4817c5f0c3e4..16272fffeb7e 100644
--- a/drivers/input/misc/gpio-beeper.c
+++ b/drivers/input/misc/gpio-beeper.c
@@ -66,13 +66,12 @@ static int gpio_beeper_probe(struct platform_device *pdev)
 {
         struct gpio_beeper *beep;
         struct input_dev *input;
-        int err;
 
         beep = devm_kzalloc(&pdev->dev, sizeof(*beep), GFP_KERNEL);
         if (!beep)
                 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))
                 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);
 
-        err = gpiod_direction_output(beep->desc, 0);
-        if (err)
-                return err;
-
         input_set_drvdata(input, beep);
 
         return input_register_device(input);