aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/video/s3c-fb.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/video/s3c-fb.c b/drivers/video/s3c-fb.c
index 6d2479d9aa7a..8a0f022c60cc 100644
--- a/drivers/video/s3c-fb.c
+++ b/drivers/video/s3c-fb.c
@@ -1544,8 +1544,7 @@ static int __devexit s3c_fb_remove(struct platform_device *pdev)
1544#ifdef CONFIG_PM_SLEEP 1544#ifdef CONFIG_PM_SLEEP
1545static int s3c_fb_suspend(struct device *dev) 1545static int s3c_fb_suspend(struct device *dev)
1546{ 1546{
1547 struct platform_device *pdev = to_platform_device(dev); 1547 struct s3c_fb *sfb = dev_get_drvdata(dev);
1548 struct s3c_fb *sfb = platform_get_drvdata(pdev);
1549 struct s3c_fb_win *win; 1548 struct s3c_fb_win *win;
1550 int win_no; 1549 int win_no;
1551 1550
@@ -1572,8 +1571,7 @@ static int s3c_fb_suspend(struct device *dev)
1572 1571
1573static int s3c_fb_resume(struct device *dev) 1572static int s3c_fb_resume(struct device *dev)
1574{ 1573{
1575 struct platform_device *pdev = to_platform_device(dev); 1574 struct s3c_fb *sfb = dev_get_drvdata(dev);
1576 struct s3c_fb *sfb = platform_get_drvdata(pdev);
1577 struct s3c_fb_platdata *pd = sfb->pdata; 1575 struct s3c_fb_platdata *pd = sfb->pdata;
1578 struct s3c_fb_win *win; 1576 struct s3c_fb_win *win;
1579 int win_no; 1577 int win_no;
@@ -1623,7 +1621,7 @@ static int s3c_fb_resume(struct device *dev)
1623 if (!win) 1621 if (!win)
1624 continue; 1622 continue;
1625 1623
1626 dev_dbg(&pdev->dev, "resuming window %d\n", win_no); 1624 dev_dbg(dev, "resuming window %d\n", win_no);
1627 s3c_fb_set_par(win->fbinfo); 1625 s3c_fb_set_par(win->fbinfo);
1628 } 1626 }
1629 1627
@@ -1636,8 +1634,7 @@ static int s3c_fb_resume(struct device *dev)
1636#ifdef CONFIG_PM_RUNTIME 1634#ifdef CONFIG_PM_RUNTIME
1637static int s3c_fb_runtime_suspend(struct device *dev) 1635static int s3c_fb_runtime_suspend(struct device *dev)
1638{ 1636{
1639 struct platform_device *pdev = to_platform_device(dev); 1637 struct s3c_fb *sfb = dev_get_drvdata(dev);
1640 struct s3c_fb *sfb = platform_get_drvdata(pdev);
1641 1638
1642 if (!sfb->variant.has_clksel) 1639 if (!sfb->variant.has_clksel)
1643 clk_disable_unprepare(sfb->lcd_clk); 1640 clk_disable_unprepare(sfb->lcd_clk);
@@ -1649,8 +1646,7 @@ static int s3c_fb_runtime_suspend(struct device *dev)
1649 1646
1650static int s3c_fb_runtime_resume(struct device *dev) 1647static int s3c_fb_runtime_resume(struct device *dev)
1651{ 1648{
1652 struct platform_device *pdev = to_platform_device(dev); 1649 struct s3c_fb *sfb = dev_get_drvdata(dev);
1653 struct s3c_fb *sfb = platform_get_drvdata(pdev);
1654 struct s3c_fb_platdata *pd = sfb->pdata; 1650 struct s3c_fb_platdata *pd = sfb->pdata;
1655 1651
1656 clk_prepare_enable(sfb->bus_clk); 1652 clk_prepare_enable(sfb->bus_clk);