Skip to content

Commit

Permalink
backlight: convert pwm_bl to dev_pm_ops
Browse files Browse the repository at this point in the history
Should be no functional changes, mainly a reorganisation to support future
work.

[akpm@linux-foundation.org: fix CONFIG_PM=n build]
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Mark Brown authored and Linus Torvalds committed Jan 11, 2012
1 parent 48e78e8 commit e2c17bc
Showing 1 changed file with 11 additions and 10 deletions.
21 changes: 11 additions & 10 deletions drivers/video/backlight/pwm_bl.c
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,9 @@ static int pwm_backlight_remove(struct platform_device *pdev)
}

#ifdef CONFIG_PM
static int pwm_backlight_suspend(struct platform_device *pdev,
pm_message_t state)
static int pwm_backlight_suspend(struct device *dev)
{
struct backlight_device *bl = platform_get_drvdata(pdev);
struct backlight_device *bl = dev_get_drvdata(dev);
struct pwm_bl_data *pb = dev_get_drvdata(&bl->dev);

if (pb->notify)
Expand All @@ -184,27 +183,29 @@ static int pwm_backlight_suspend(struct platform_device *pdev,
return 0;
}

static int pwm_backlight_resume(struct platform_device *pdev)
static int pwm_backlight_resume(struct device *dev)
{
struct backlight_device *bl = platform_get_drvdata(pdev);
struct backlight_device *bl = dev_get_drvdata(dev);

backlight_update_status(bl);
return 0;
}
#else
#define pwm_backlight_suspend NULL
#define pwm_backlight_resume NULL

static SIMPLE_DEV_PM_OPS(pwm_backlight_pm_ops, pwm_backlight_suspend,
pwm_backlight_resume);

#endif

static struct platform_driver pwm_backlight_driver = {
.driver = {
.name = "pwm-backlight",
.owner = THIS_MODULE,
#ifdef CONFIG_PM
.pm = &pwm_backlight_pm_ops,
#endif
},
.probe = pwm_backlight_probe,
.remove = pwm_backlight_remove,
.suspend = pwm_backlight_suspend,
.resume = pwm_backlight_resume,
};

module_platform_driver(pwm_backlight_driver);
Expand Down

0 comments on commit e2c17bc

Please sign in to comment.