diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-14 15:35:28 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-14 15:35:28 +1100 |
commit | f600c997a1e930c3be312fdc4d1a67979d89173e (patch) | |
tree | 352f5d35d672887a5552730cb71af9d3f068fe19 /drivers/video/backlight/ltv350qv.c | |
parent | 065957b017e290977dc5527ae4e21cff9d3fb5ec (diff) | |
parent | 0ef183f7f162a62662f6002b03bcf3ca2903c937 (diff) |
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/video/backlight/ltv350qv.c')
-rw-r--r-- | drivers/video/backlight/ltv350qv.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/video/backlight/ltv350qv.c b/drivers/video/backlight/ltv350qv.c index 226d813edf01..c0b4b8f2de98 100644 --- a/drivers/video/backlight/ltv350qv.c +++ b/drivers/video/backlight/ltv350qv.c @@ -252,7 +252,7 @@ static int ltv350qv_probe(struct spi_device *spi) if (ret) goto out_unregister; - dev_set_drvdata(&spi->dev, lcd); + spi_set_drvdata(spi, lcd); return 0; @@ -263,7 +263,7 @@ out_unregister: static int ltv350qv_remove(struct spi_device *spi) { - struct ltv350qv *lcd = dev_get_drvdata(&spi->dev); + struct ltv350qv *lcd = spi_get_drvdata(spi); ltv350qv_power(lcd, FB_BLANK_POWERDOWN); lcd_device_unregister(lcd->ld); @@ -274,14 +274,14 @@ static int ltv350qv_remove(struct spi_device *spi) #ifdef CONFIG_PM static int ltv350qv_suspend(struct spi_device *spi, pm_message_t state) { - struct ltv350qv *lcd = dev_get_drvdata(&spi->dev); + struct ltv350qv *lcd = spi_get_drvdata(spi); return ltv350qv_power(lcd, FB_BLANK_POWERDOWN); } static int ltv350qv_resume(struct spi_device *spi) { - struct ltv350qv *lcd = dev_get_drvdata(&spi->dev); + struct ltv350qv *lcd = spi_get_drvdata(spi); return ltv350qv_power(lcd, FB_BLANK_UNBLANK); } @@ -293,7 +293,7 @@ static int ltv350qv_resume(struct spi_device *spi) /* Power down all displays on reboot, poweroff or halt */ static void ltv350qv_shutdown(struct spi_device *spi) { - struct ltv350qv *lcd = dev_get_drvdata(&spi->dev); + struct ltv350qv *lcd = spi_get_drvdata(spi); ltv350qv_power(lcd, FB_BLANK_POWERDOWN); } |