backlight: tosa: use devm_gpio_request_one

By using devm_gpio_request_one it is possible to set the direction and
initial value in one shot.  Thus, using devm_gpio_request_one can make the
code simpler.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: Dmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/video/backlight/tosa_bl.c b/drivers/video/backlight/tosa_bl.c
index 07ee31a4951cf2227ea3ff45e6813a4c7cd233ea..588682cc1614569c3283ee1c164e8f3f9ebd8795 100644 (file)
--- a/drivers/video/backlight/tosa_bl.c
+++ b/drivers/video/backlight/tosa_bl.c
@@ -92,14 +92,12 @@ static int tosa_bl_probe(struct i2c_client *client,
 
        data->comadj = sharpsl_param.comadj == -1 ? COMADJ_DEFAULT : sharpsl_param.comadj;
 
-       ret = devm_gpio_request(&client->dev, TOSA_GPIO_BL_C20MA, "backlight");
+       ret = devm_gpio_request_one(&client->dev, TOSA_GPIO_BL_C20MA,
+                               GPIOF_OUT_INIT_LOW, "backlight");
        if (ret) {
                dev_dbg(&data->bl->dev, "Unable to request gpio!\n");
                return ret;
        }
-       ret = gpio_direction_output(TOSA_GPIO_BL_C20MA, 0);
-       if (ret)
-               return ret;
 
        i2c_set_clientdata(client, data);
        data->i2c = client;

diff --git a/drivers/video/backlight/tosa_lcd.c b/drivers/video/backlight/tosa_lcd.c
index 2a2d506f08c0966f4cacd33e1950c7d8c1c3f99e..96bae941585a4952585b6e8b80b62402453649d4 100644 (file)
--- a/drivers/video/backlight/tosa_lcd.c
+++ b/drivers/video/backlight/tosa_lcd.c
@@ -195,17 +195,13 @@ static int tosa_lcd_probe(struct spi_device *spi)
        data->spi = spi;
        dev_set_drvdata(&spi->dev, data);
 
-       ret = devm_gpio_request(&spi->dev, TOSA_GPIO_TG_ON, "tg #pwr");
+       ret = devm_gpio_request_one(&spi->dev, TOSA_GPIO_TG_ON,
+                               GPIOF_OUT_INIT_LOW, "tg #pwr");
        if (ret < 0)
                goto err_gpio_tg;
 
        mdelay(60);
 
-       ret = gpio_direction_output(TOSA_GPIO_TG_ON, 0);
-       if (ret < 0)
-               goto err_gpio_tg;
-
-       mdelay(60);
        tosa_lcd_tg_init(data);
 
        tosa_lcd_tg_on(data);