diff options
| author | Jingoo Han <jg1.han@samsung.com> | 2013-04-29 16:20:59 -0700 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-29 18:28:39 -0700 | 
| commit | b4df8f6ca1d93a89b67dd29a785757f289475729 (patch) | |
| tree | 6ee301ebeb75fac3e38657346914af0efda5e6ee /drivers/rtc | |
| parent | 4dc8eb13c2b99a334ee703061e75ee71d582dd1f (diff) | |
| download | olio-linux-3.10-b4df8f6ca1d93a89b67dd29a785757f289475729.tar.xz olio-linux-3.10-b4df8f6ca1d93a89b67dd29a785757f289475729.zip  | |
rtc: rtc-bfin: convert bfin_rtc_driver to dev_pm_ops
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>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/rtc')
| -rw-r--r-- | drivers/rtc/rtc-bfin.c | 18 | 
1 files changed, 6 insertions, 12 deletions
diff --git a/drivers/rtc/rtc-bfin.c b/drivers/rtc/rtc-bfin.c index d8b06f50ad5..ad44ec5dc29 100644 --- a/drivers/rtc/rtc-bfin.c +++ b/drivers/rtc/rtc-bfin.c @@ -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)) { @@ -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)) @@ -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);  |