From 2a211699c6680c9223730d40f2703ce060d87834 Mon Sep 17 00:00:00 2001 From: Jingoo Han Date: Tue, 16 Oct 2012 13:21:44 +0900 Subject: [PATCH] --- yaml --- r: 344543 b: refs/heads/master c: bab8b563ef08455440badca7fe79b2c700bd1b75 h: refs/heads/master i: 344541: 6cee392b51cd0659b90e1aecd38852e354fb0463 344539: f750398a50f8f9eed188b10e2fd0c16a9d044907 344535: 1bac3e495d51ff442c1307a6ae57e1aedc3b20a6 344527: 1fbc264cda118ec3dfdeb454e052184d4cc562ce 344511: 7b0ecc28a5e92e1f27bd3e55ee3310861bb8f0f9 v: v3 --- [refs] | 2 +- trunk/drivers/video/s3c-fb.c | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index c9a0bad58467..13f6e0d8aab4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0b466568c980300a3ac69c4f40f8f3fd5ae14bae +refs/heads/master: bab8b563ef08455440badca7fe79b2c700bd1b75 diff --git a/trunk/drivers/video/s3c-fb.c b/trunk/drivers/video/s3c-fb.c index 6d2479d9aa7a..8a0f022c60cc 100644 --- a/trunk/drivers/video/s3c-fb.c +++ b/trunk/drivers/video/s3c-fb.c @@ -1544,8 +1544,7 @@ static int __devexit s3c_fb_remove(struct platform_device *pdev) #ifdef CONFIG_PM_SLEEP static int s3c_fb_suspend(struct device *dev) { - struct platform_device *pdev = to_platform_device(dev); - struct s3c_fb *sfb = platform_get_drvdata(pdev); + struct s3c_fb *sfb = dev_get_drvdata(dev); struct s3c_fb_win *win; int win_no; @@ -1572,8 +1571,7 @@ static int s3c_fb_suspend(struct device *dev) static int s3c_fb_resume(struct device *dev) { - struct platform_device *pdev = to_platform_device(dev); - struct s3c_fb *sfb = platform_get_drvdata(pdev); + struct s3c_fb *sfb = dev_get_drvdata(dev); struct s3c_fb_platdata *pd = sfb->pdata; struct s3c_fb_win *win; int win_no; @@ -1623,7 +1621,7 @@ static int s3c_fb_resume(struct device *dev) if (!win) continue; - dev_dbg(&pdev->dev, "resuming window %d\n", win_no); + dev_dbg(dev, "resuming window %d\n", win_no); s3c_fb_set_par(win->fbinfo); } @@ -1636,8 +1634,7 @@ static int s3c_fb_resume(struct device *dev) #ifdef CONFIG_PM_RUNTIME static int s3c_fb_runtime_suspend(struct device *dev) { - struct platform_device *pdev = to_platform_device(dev); - struct s3c_fb *sfb = platform_get_drvdata(pdev); + struct s3c_fb *sfb = dev_get_drvdata(dev); if (!sfb->variant.has_clksel) clk_disable_unprepare(sfb->lcd_clk); @@ -1649,8 +1646,7 @@ static int s3c_fb_runtime_suspend(struct device *dev) static int s3c_fb_runtime_resume(struct device *dev) { - struct platform_device *pdev = to_platform_device(dev); - struct s3c_fb *sfb = platform_get_drvdata(pdev); + struct s3c_fb *sfb = dev_get_drvdata(dev); struct s3c_fb_platdata *pd = sfb->pdata; clk_prepare_enable(sfb->bus_clk);