diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-22 05:38:49 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-22 05:38:49 +0400 |
| commit | 7c2db36e730ee4facd341679ecb21ee73ba92831 (patch) | |
| tree | 75016fba72aaf0581b9263f7fa4c565e6e634f3c /drivers/video/backlight/vgg2432a4.c | |
| parent | 8b5628ab83b671f96ac9f174c1bd51c92589fc82 (diff) | |
| parent | a47a376f1c025e23e836c0376813c0424de665c2 (diff) | |
| download | linux-7c2db36e730ee4facd341679ecb21ee73ba92831.tar.xz | |
Merge branch 'akpm' (incoming from Andrew)
Merge misc patches from Andrew Morton:
- Florian has vanished so I appear to have become fbdev maintainer
again :(
- Joel and Mark are distracted to welcome to the new OCFS2 maintainer
- The backlight queue
- Small core kernel changes
- lib/ updates
- The rtc queue
- Various random bits
* akpm: (164 commits)
rtc: rtc-davinci: use devm_*() functions
rtc: rtc-max8997: use devm_request_threaded_irq()
rtc: rtc-max8907: use devm_request_threaded_irq()
rtc: rtc-da9052: use devm_request_threaded_irq()
rtc: rtc-wm831x: use devm_request_threaded_irq()
rtc: rtc-tps80031: use devm_request_threaded_irq()
rtc: rtc-lp8788: use devm_request_threaded_irq()
rtc: rtc-coh901331: use devm_clk_get()
rtc: rtc-vt8500: use devm_*() functions
rtc: rtc-tps6586x: use devm_request_threaded_irq()
rtc: rtc-imxdi: use devm_clk_get()
rtc: rtc-cmos: use dev_warn()/dev_dbg() instead of printk()/pr_debug()
rtc: rtc-pcf8583: use dev_warn() instead of printk()
rtc: rtc-sun4v: use pr_warn() instead of printk()
rtc: rtc-vr41xx: use dev_info() instead of printk()
rtc: rtc-rs5c313: use pr_err() instead of printk()
rtc: rtc-at91rm9200: use dev_dbg()/dev_err() instead of printk()/pr_debug()
rtc: rtc-rs5c372: use dev_dbg()/dev_warn() instead of printk()/pr_debug()
rtc: rtc-ds2404: use dev_err() instead of printk()
rtc: rtc-efi: use dev_err()/dev_warn()/pr_err() instead of printk()
...
Diffstat (limited to 'drivers/video/backlight/vgg2432a4.c')
| -rw-r--r-- | drivers/video/backlight/vgg2432a4.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/video/backlight/vgg2432a4.c b/drivers/video/backlight/vgg2432a4.c index 45e81b4cf8b4..84d582f591dc 100644 --- a/drivers/video/backlight/vgg2432a4.c +++ b/drivers/video/backlight/vgg2432a4.c @@ -208,12 +208,11 @@ static int vgg2432a4_lcd_init(struct ili9320 *lcd, #ifdef CONFIG_PM static int vgg2432a4_suspend(struct spi_device *spi, pm_message_t state) { - return ili9320_suspend(dev_get_drvdata(&spi->dev), state); + return ili9320_suspend(spi_get_drvdata(spi), state); } - static int vgg2432a4_resume(struct spi_device *spi) { - return ili9320_resume(dev_get_drvdata(&spi->dev)); + return ili9320_resume(spi_get_drvdata(spi)); } #else #define vgg2432a4_suspend NULL @@ -242,12 +241,12 @@ static int vgg2432a4_probe(struct spi_device *spi) static int vgg2432a4_remove(struct spi_device *spi) { - return ili9320_remove(dev_get_drvdata(&spi->dev)); + return ili9320_remove(spi_get_drvdata(spi)); } static void vgg2432a4_shutdown(struct spi_device *spi) { - ili9320_shutdown(dev_get_drvdata(&spi->dev)); + ili9320_shutdown(spi_get_drvdata(spi)); } static struct spi_driver vgg2432a4_driver = { |