video: use gpio_request_one

Using gpio_request_one can make the code simpler because it can
set the direction and initial value in one shot.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Michael Hennerich <michael.hennerich@analog.com>
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>

2 files changed, 2 insertions, 12 deletions

diff --git a/drivers/video/msm/mddi_client_nt35399.c b/drivers/video/msm/mddi_client_nt35399.c
index f239f4a25e01..7fcd67e132bf 100644
--- a/drivers/video/msm/mddi_client_nt35399.c
+++ b/drivers/video/msm/mddi_client_nt35399.c
@@ -155,14 +155,10 @@ static int setup_vsync(struct panel_info *panel, int init)
                 ret = 0;
                 goto uninit;
         }
-        ret = gpio_request(gpio, "vsync");
+        ret = gpio_request_one(gpio, GPIOF_IN, "vsync");
         if (ret)
                 goto err_request_gpio_failed;
 
-        ret = gpio_direction_input(gpio);
-        if (ret)
-                goto err_gpio_direction_input_failed;
-
         ret = irq = gpio_to_irq(gpio);
         if (ret < 0)
                 goto err_get_irq_num_failed;
@@ -180,7 +176,6 @@ uninit:
         free_irq(gpio_to_irq(gpio), panel->client_data);
 err_request_irq_failed:
 err_get_irq_num_failed:
-err_gpio_direction_input_failed:
         gpio_free(gpio);
 err_request_gpio_failed:
         return ret;
diff --git a/drivers/video/msm/mddi_client_toshiba.c b/drivers/video/msm/mddi_client_toshiba.c
index f9bc932ac46b..053eb6877330 100644
--- a/drivers/video/msm/mddi_client_toshiba.c
+++ b/drivers/video/msm/mddi_client_toshiba.c
@@ -186,14 +186,10 @@ static int setup_vsync(struct panel_info *panel,
                 ret = 0;
                 goto uninit;
         }
-        ret = gpio_request(gpio, "vsync");
+        ret = gpio_request_one(gpio, GPIOF_IN, "vsync");
         if (ret)
                 goto err_request_gpio_failed;
 
-        ret = gpio_direction_input(gpio);
-        if (ret)
-                goto err_gpio_direction_input_failed;
-
         ret = irq = gpio_to_irq(gpio);
         if (ret < 0)
                 goto err_get_irq_num_failed;
@@ -210,7 +206,6 @@ uninit:
         free_irq(gpio_to_irq(gpio), panel);
 err_request_irq_failed:
 err_get_irq_num_failed:
-err_gpio_direction_input_failed:
         gpio_free(gpio);
 err_request_gpio_failed:
         return ret;