Skip to content

Commit

Permalink
backlight: convert platform_lcd to dev_pm_ops
Browse files Browse the repository at this point in the history
Instead of using legacy suspend/resume methods, using newer dev_pm_ops
structure allows better control over power management.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Jingoo Han authored and Linus Torvalds committed Mar 23, 2012
1 parent 35c1682 commit 67a6727
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions drivers/video/backlight/platform_lcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -121,39 +121,40 @@ static int __devexit platform_lcd_remove(struct platform_device *pdev)
}

#ifdef CONFIG_PM
static int platform_lcd_suspend(struct platform_device *pdev, pm_message_t st)
static int platform_lcd_suspend(struct device *dev)
{
struct platform_lcd *plcd = platform_get_drvdata(pdev);
struct platform_lcd *plcd = dev_get_drvdata(dev);

plcd->suspended = 1;
platform_lcd_set_power(plcd->lcd, plcd->power);

return 0;
}

static int platform_lcd_resume(struct platform_device *pdev)
static int platform_lcd_resume(struct device *dev)
{
struct platform_lcd *plcd = platform_get_drvdata(pdev);
struct platform_lcd *plcd = dev_get_drvdata(dev);

plcd->suspended = 0;
platform_lcd_set_power(plcd->lcd, plcd->power);

return 0;
}
#else
#define platform_lcd_suspend NULL
#define platform_lcd_resume NULL

static SIMPLE_DEV_PM_OPS(platform_lcd_pm_ops, platform_lcd_suspend,
platform_lcd_resume);
#endif

static struct platform_driver platform_lcd_driver = {
.driver = {
.name = "platform-lcd",
.owner = THIS_MODULE,
#ifdef CONFIG_PM
.pm = &platform_lcd_pm_ops,
#endif
},
.probe = platform_lcd_probe,
.remove = __devexit_p(platform_lcd_remove),
.suspend = platform_lcd_suspend,
.resume = platform_lcd_resume,
};

module_platform_driver(platform_lcd_driver);
Expand Down

0 comments on commit 67a6727

Please sign in to comment.