Skip to content

Commit

Permalink
rtc: rtc-bfin: convert bfin_rtc_driver 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 <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Jingoo Han authored and torvalds committed Apr 30, 2013
1 parent 4dc8eb1 commit b4df8f6
Showing 1 changed file with 6 additions and 12 deletions.
18 changes: 6 additions & 12 deletions drivers/rtc/rtc-bfin.c
Original file line number Diff line number Diff line change
Expand Up @@ -396,11 +396,9 @@ static int bfin_rtc_remove(struct platform_device *pdev)
return 0;
}

#ifdef CONFIG_PM
static int bfin_rtc_suspend(struct platform_device *pdev, pm_message_t state)
#ifdef CONFIG_PM_SLEEP
static int bfin_rtc_suspend(struct device *dev)
{
struct device *dev = &pdev->dev;

dev_dbg_stamp(dev);

if (device_may_wakeup(dev)) {
Expand All @@ -412,10 +410,8 @@ static int bfin_rtc_suspend(struct platform_device *pdev, pm_message_t state)
return 0;
}

static int bfin_rtc_resume(struct platform_device *pdev)
static int bfin_rtc_resume(struct device *dev)
{
struct device *dev = &pdev->dev;

dev_dbg_stamp(dev);

if (device_may_wakeup(dev))
Expand All @@ -434,20 +430,18 @@ static int bfin_rtc_resume(struct platform_device *pdev)

return 0;
}
#else
# define bfin_rtc_suspend NULL
# define bfin_rtc_resume NULL
#endif

static SIMPLE_DEV_PM_OPS(bfin_rtc_pm_ops, bfin_rtc_suspend, bfin_rtc_resume);

static struct platform_driver bfin_rtc_driver = {
.driver = {
.name = "rtc-bfin",
.owner = THIS_MODULE,
.pm = &bfin_rtc_pm_ops,
},
.probe = bfin_rtc_probe,
.remove = bfin_rtc_remove,
.suspend = bfin_rtc_suspend,
.resume = bfin_rtc_resume,
};

module_platform_driver(bfin_rtc_driver);
Expand Down

0 comments on commit b4df8f6

Please sign in to comment.