aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/da8xx-fb.c
diff options
context:
space:
mode:
authorManish Badarkhe <badarkhe.manish@gmail.com>2014-02-17 22:25:36 -0500
committerTomi Valkeinen <tomi.valkeinen@ti.com>2014-02-28 05:35:42 -0500
commit622f7c9b9a27acce6cd9ec33f80c682e1a84b86e (patch)
tree848e12f192f94b340172f345098283da1a39a225 /drivers/video/da8xx-fb.c
parentf1d2ff8b9d0c6192a9ade7195353e434c9273e64 (diff)
video: da8xx-fb: Use "SIMPLE_DEV_PM_OPS" macro
Update driver to use SIMPLE_DEV_PM_OPS macro for power management suspend and resume operations. Signed-off-by: Manish Badarkhe <badarkhe.manish@gmail.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/da8xx-fb.c')
-rw-r--r--drivers/video/da8xx-fb.c22
1 files changed, 10 insertions, 12 deletions
diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c
index a1d74dd11988..0c0ba920ea48 100644
--- a/drivers/video/da8xx-fb.c
+++ b/drivers/video/da8xx-fb.c
@@ -1546,7 +1546,7 @@ err_pm_runtime_disable:
1546 return ret; 1546 return ret;
1547} 1547}
1548 1548
1549#ifdef CONFIG_PM 1549#ifdef CONFIG_PM_SLEEP
1550static struct lcdc_context { 1550static struct lcdc_context {
1551 u32 clk_enable; 1551 u32 clk_enable;
1552 u32 ctrl; 1552 u32 ctrl;
@@ -1610,9 +1610,9 @@ static void lcd_context_restore(void)
1610 return; 1610 return;
1611} 1611}
1612 1612
1613static int fb_suspend(struct platform_device *dev, pm_message_t state) 1613static int fb_suspend(struct device *dev)
1614{ 1614{
1615 struct fb_info *info = platform_get_drvdata(dev); 1615 struct fb_info *info = dev_get_drvdata(dev);
1616 struct da8xx_fb_par *par = info->par; 1616 struct da8xx_fb_par *par = info->par;
1617 1617
1618 console_lock(); 1618 console_lock();
@@ -1622,18 +1622,18 @@ static int fb_suspend(struct platform_device *dev, pm_message_t state)
1622 fb_set_suspend(info, 1); 1622 fb_set_suspend(info, 1);
1623 lcd_disable_raster(DA8XX_FRAME_WAIT); 1623 lcd_disable_raster(DA8XX_FRAME_WAIT);
1624 lcd_context_save(); 1624 lcd_context_save();
1625 pm_runtime_put_sync(&dev->dev); 1625 pm_runtime_put_sync(dev);
1626 console_unlock(); 1626 console_unlock();
1627 1627
1628 return 0; 1628 return 0;
1629} 1629}
1630static int fb_resume(struct platform_device *dev) 1630static int fb_resume(struct device *dev)
1631{ 1631{
1632 struct fb_info *info = platform_get_drvdata(dev); 1632 struct fb_info *info = dev_get_drvdata(dev);
1633 struct da8xx_fb_par *par = info->par; 1633 struct da8xx_fb_par *par = info->par;
1634 1634
1635 console_lock(); 1635 console_lock();
1636 pm_runtime_get_sync(&dev->dev); 1636 pm_runtime_get_sync(dev);
1637 lcd_context_restore(); 1637 lcd_context_restore();
1638 if (par->blank == FB_BLANK_UNBLANK) { 1638 if (par->blank == FB_BLANK_UNBLANK) {
1639 lcd_enable_raster(); 1639 lcd_enable_raster();
@@ -1647,19 +1647,17 @@ static int fb_resume(struct platform_device *dev)
1647 1647
1648 return 0; 1648 return 0;
1649} 1649}
1650#else
1651#define fb_suspend NULL
1652#define fb_resume NULL
1653#endif 1650#endif
1654 1651
1652static SIMPLE_DEV_PM_OPS(fb_pm_ops, fb_suspend, fb_resume);
1653
1655static struct platform_driver da8xx_fb_driver = { 1654static struct platform_driver da8xx_fb_driver = {
1656 .probe = fb_probe, 1655 .probe = fb_probe,
1657 .remove = fb_remove, 1656 .remove = fb_remove,
1658 .suspend = fb_suspend,
1659 .resume = fb_resume,
1660 .driver = { 1657 .driver = {
1661 .name = DRIVER_NAME, 1658 .name = DRIVER_NAME,
1662 .owner = THIS_MODULE, 1659 .owner = THIS_MODULE,
1660 .pm = &fb_pm_ops,
1663 }, 1661 },
1664}; 1662};
1665module_platform_driver(da8xx_fb_driver); 1663module_platform_driver(da8xx_fb_driver);