From 75a14e02421706bad27253218bbafffd40a6884c Mon Sep 17 00:00:00 2001
From: Jingoo Han <jg1.han@samsung.com>
Date: Mon, 17 Dec 2012 16:00:41 -0800
Subject: [PATCH] --- yaml --- r: 346383 b: refs/heads/master c:
 05a5d4d2640dfe934ec78ba577dd21baccb11aa6 h: refs/heads/master i:   346381:
 adbcfe87b52ee09945d4fe128ce9fdc7db8a81b9   346379:
 5c8fd27b14ff82efab7282106d4244ff80b89e3a   346375:
 ee53a040454de1f10d5179d41ff01494d44582bc   346367:
 610e5ca914b176101103024fed696a65b7d85de2 v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/video/backlight/tosa_bl.c  | 6 ++----
 trunk/drivers/video/backlight/tosa_lcd.c | 8 ++------
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 897cf1d9fb71..db9e9907ad2d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a5a07436669b3072fbe9f06d27667ec6db62bf5
+refs/heads/master: 05a5d4d2640dfe934ec78ba577dd21baccb11aa6
diff --git a/trunk/drivers/video/backlight/tosa_bl.c b/trunk/drivers/video/backlight/tosa_bl.c
index 07ee31a4951c..588682cc1614 100644
--- a/trunk/drivers/video/backlight/tosa_bl.c
+++ b/trunk/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/trunk/drivers/video/backlight/tosa_lcd.c b/trunk/drivers/video/backlight/tosa_lcd.c
index 2a2d506f08c0..96bae941585a 100644
--- a/trunk/drivers/video/backlight/tosa_lcd.c
+++ b/trunk/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);