Skip to content

Commit

Permalink
rtc: convert WM8350 RTC driver to dev_pm_ops
Browse files Browse the repository at this point in the history
Convert WM8350 RTC driver to dev_pm_ops

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Alessandro Zummo <a.zummo@towertech.it>
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 Dec 16, 2009
1 parent aeedaca commit 6f38b04
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions drivers/rtc/rtc-wm8350.c
Original file line number Diff line number Diff line change
Expand Up @@ -354,8 +354,9 @@ static const struct rtc_class_ops wm8350_rtc_ops = {
};

#ifdef CONFIG_PM
static int wm8350_rtc_suspend(struct platform_device *pdev, pm_message_t state)
static int wm8350_rtc_suspend(struct device *dev)
{
struct platform_device *pdev = to_platform_device(dev);
struct wm8350 *wm8350 = dev_get_drvdata(&pdev->dev);
int ret = 0;
u16 reg;
Expand All @@ -373,8 +374,9 @@ static int wm8350_rtc_suspend(struct platform_device *pdev, pm_message_t state)
return ret;
}

static int wm8350_rtc_resume(struct platform_device *pdev)
static int wm8350_rtc_resume(struct device *dev)
{
struct platform_device *pdev = to_platform_device(dev);
struct wm8350 *wm8350 = dev_get_drvdata(&pdev->dev);
int ret;

Expand Down Expand Up @@ -484,13 +486,17 @@ static int __devexit wm8350_rtc_remove(struct platform_device *pdev)
return 0;
}

static struct dev_pm_ops wm8350_rtc_pm_ops = {
.suspend = wm8350_rtc_suspend,
.resume = wm8350_rtc_resume,
};

static struct platform_driver wm8350_rtc_driver = {
.probe = wm8350_rtc_probe,
.remove = __devexit_p(wm8350_rtc_remove),
.suspend = wm8350_rtc_suspend,
.resume = wm8350_rtc_resume,
.driver = {
.name = "wm8350-rtc",
.pm = &wm8350_rtc_pm_ops,
},
};

Expand Down

0 comments on commit 6f38b04

Please sign in to comment.