aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/backlight
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-02-21 19:43:41 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-21 20:22:23 -0500
commitc324f51a2e44ecd28fab19a7941ee3e4173cf641 (patch)
tree4705358df08dbd581db1ceea8415846c9e21939f /drivers/video/backlight
parent1b8d2834a663a3beedb04374293b637166ce8e4f (diff)
backlight: tosa: use spi_get_drvdata and spi_set_drvdata
Use the wrapper functions for getting and setting the driver data using spi_device instead of using dev_{get|set}_drvdata with &spi->dev, so we can directly pass a struct spi_device. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/backlight')
-rw-r--r--drivers/video/backlight/tosa_lcd.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/video/backlight/tosa_lcd.c b/drivers/video/backlight/tosa_lcd.c
index 96bae941585a..666fe2593ea4 100644
--- a/drivers/video/backlight/tosa_lcd.c
+++ b/drivers/video/backlight/tosa_lcd.c
@@ -193,7 +193,7 @@ static int tosa_lcd_probe(struct spi_device *spi)
193 return ret; 193 return ret;
194 194
195 data->spi = spi; 195 data->spi = spi;
196 dev_set_drvdata(&spi->dev, data); 196 spi_set_drvdata(spi, data);
197 197
198 ret = devm_gpio_request_one(&spi->dev, TOSA_GPIO_TG_ON, 198 ret = devm_gpio_request_one(&spi->dev, TOSA_GPIO_TG_ON,
199 GPIOF_OUT_INIT_LOW, "tg #pwr"); 199 GPIOF_OUT_INIT_LOW, "tg #pwr");
@@ -220,13 +220,13 @@ static int tosa_lcd_probe(struct spi_device *spi)
220err_register: 220err_register:
221 tosa_lcd_tg_off(data); 221 tosa_lcd_tg_off(data);
222err_gpio_tg: 222err_gpio_tg:
223 dev_set_drvdata(&spi->dev, NULL); 223 spi_set_drvdata(spi, NULL);
224 return ret; 224 return ret;
225} 225}
226 226
227static int tosa_lcd_remove(struct spi_device *spi) 227static int tosa_lcd_remove(struct spi_device *spi)
228{ 228{
229 struct tosa_lcd_data *data = dev_get_drvdata(&spi->dev); 229 struct tosa_lcd_data *data = spi_get_drvdata(spi);
230 230
231 lcd_device_unregister(data->lcd); 231 lcd_device_unregister(data->lcd);
232 232
@@ -235,7 +235,7 @@ static int tosa_lcd_remove(struct spi_device *spi)
235 235
236 tosa_lcd_tg_off(data); 236 tosa_lcd_tg_off(data);
237 237
238 dev_set_drvdata(&spi->dev, NULL); 238 spi_set_drvdata(spi, NULL);
239 239
240 return 0; 240 return 0;
241} 241}
@@ -243,7 +243,7 @@ static int tosa_lcd_remove(struct spi_device *spi)
243#ifdef CONFIG_PM 243#ifdef CONFIG_PM
244static int tosa_lcd_suspend(struct spi_device *spi, pm_message_t state) 244static int tosa_lcd_suspend(struct spi_device *spi, pm_message_t state)
245{ 245{
246 struct tosa_lcd_data *data = dev_get_drvdata(&spi->dev); 246 struct tosa_lcd_data *data = spi_get_drvdata(spi);
247 247
248 tosa_lcd_tg_off(data); 248 tosa_lcd_tg_off(data);
249 249
@@ -252,7 +252,7 @@ static int tosa_lcd_suspend(struct spi_device *spi, pm_message_t state)
252 252
253static int tosa_lcd_resume(struct spi_device *spi) 253static int tosa_lcd_resume(struct spi_device *spi)
254{ 254{
255 struct tosa_lcd_data *data = dev_get_drvdata(&spi->dev); 255 struct tosa_lcd_data *data = spi_get_drvdata(spi);
256 256
257 tosa_lcd_tg_init(data); 257 tosa_lcd_tg_init(data);
258 if (POWER_IS_ON(data->lcd_power)) 258 if (POWER_IS_ON(data->lcd_power))