aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2012-12-17 19:00:41 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-17 20:15:15 -0500
commit05a5d4d2640dfe934ec78ba577dd21baccb11aa6 (patch)
treee96ea55ba9907a5e6435b78764715875acd2280b /drivers/video
parent5a5a07436669b3072fbe9f06d27667ec6db62bf5 (diff)
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>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/backlight/tosa_bl.c6
-rw-r--r--drivers/video/backlight/tosa_lcd.c8
2 files changed, 4 insertions, 10 deletions
diff --git a/drivers/video/backlight/tosa_bl.c b/drivers/video/backlight/tosa_bl.c
index 07ee31a4951c..588682cc1614 100644
--- 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,
92 92
93 data->comadj = sharpsl_param.comadj == -1 ? COMADJ_DEFAULT : sharpsl_param.comadj; 93 data->comadj = sharpsl_param.comadj == -1 ? COMADJ_DEFAULT : sharpsl_param.comadj;
94 94
95 ret = devm_gpio_request(&client->dev, TOSA_GPIO_BL_C20MA, "backlight"); 95 ret = devm_gpio_request_one(&client->dev, TOSA_GPIO_BL_C20MA,
96 GPIOF_OUT_INIT_LOW, "backlight");
96 if (ret) { 97 if (ret) {
97 dev_dbg(&data->bl->dev, "Unable to request gpio!\n"); 98 dev_dbg(&data->bl->dev, "Unable to request gpio!\n");
98 return ret; 99 return ret;
99 } 100 }
100 ret = gpio_direction_output(TOSA_GPIO_BL_C20MA, 0);
101 if (ret)
102 return ret;
103 101
104 i2c_set_clientdata(client, data); 102 i2c_set_clientdata(client, data);
105 data->i2c = client; 103 data->i2c = client;
diff --git a/drivers/video/backlight/tosa_lcd.c b/drivers/video/backlight/tosa_lcd.c
index 2a2d506f08c0..96bae941585a 100644
--- 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)
195 data->spi = spi; 195 data->spi = spi;
196 dev_set_drvdata(&spi->dev, data); 196 dev_set_drvdata(&spi->dev, data);
197 197
198 ret = devm_gpio_request(&spi->dev, TOSA_GPIO_TG_ON, "tg #pwr"); 198 ret = devm_gpio_request_one(&spi->dev, TOSA_GPIO_TG_ON,
199 GPIOF_OUT_INIT_LOW, "tg #pwr");
199 if (ret < 0) 200 if (ret < 0)
200 goto err_gpio_tg; 201 goto err_gpio_tg;
201 202
202 mdelay(60); 203 mdelay(60);
203 204
204 ret = gpio_direction_output(TOSA_GPIO_TG_ON, 0);
205 if (ret < 0)
206 goto err_gpio_tg;
207
208 mdelay(60);
209 tosa_lcd_tg_init(data); 205 tosa_lcd_tg_init(data);
210 206
211 tosa_lcd_tg_on(data); 207 tosa_lcd_tg_on(data);