Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04ebc359 authored by Jingoo Han's avatar Jingoo Han Committed by Linus Torvalds
Browse files

rtc: rtc-omap: convert omap_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: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 62068e2c

drivers/rtc/rtc-omap.c

+10 −14
Original line number Diff line number Diff line
@@ -464,11 +464,10 @@ static int __exit omap_rtc_remove(struct platform_device *pdev) 
	return 0;

}



#ifdef CONFIG_PM



#ifdef CONFIG_PM_SLEEP

static u8 irqstat;



static int omap_rtc_suspend(struct platform_device *pdev, pm_message_t state)

static int omap_rtc_suspend(struct device *dev)

{

	irqstat = rtc_read(OMAP_RTC_INTERRUPTS_REG);
@@ -476,34 +475,32 @@ static int omap_rtc_suspend(struct platform_device *pdev, pm_message_t state) 
	 * source, and in fact this enable() call is just saving a flag

	 * that's never used...

	 */

	if (device_may_wakeup(&pdev->dev))

	if (device_may_wakeup(dev))

		enable_irq_wake(omap_rtc_alarm);

	else

		rtc_write(0, OMAP_RTC_INTERRUPTS_REG);



	/* Disable the clock/module */

	pm_runtime_put_sync(&pdev->dev);

	pm_runtime_put_sync(dev);



	return 0;

}



static int omap_rtc_resume(struct platform_device *pdev)

static int omap_rtc_resume(struct device *dev)

{

	/* Enable the clock/module so that we can access the registers */

	pm_runtime_get_sync(&pdev->dev);

	pm_runtime_get_sync(dev);



	if (device_may_wakeup(&pdev->dev))

	if (device_may_wakeup(dev))

		disable_irq_wake(omap_rtc_alarm);

	else

		rtc_write(irqstat, OMAP_RTC_INTERRUPTS_REG);

	return 0;

}



#else

#define omap_rtc_suspend NULL

#define omap_rtc_resume  NULL

#endif



static SIMPLE_DEV_PM_OPS(omap_rtc_pm_ops, omap_rtc_suspend, omap_rtc_resume);



static void omap_rtc_shutdown(struct platform_device *pdev)

{

	rtc_write(0, OMAP_RTC_INTERRUPTS_REG);
@@ -512,12 +509,11 @@ static void omap_rtc_shutdown(struct platform_device *pdev) 
MODULE_ALIAS("platform:omap_rtc");

static struct platform_driver omap_rtc_driver = {

	.remove		= __exit_p(omap_rtc_remove),

	.suspend	= omap_rtc_suspend,

	.resume		= omap_rtc_resume,

	.shutdown	= omap_rtc_shutdown,

	.driver		= {

		.name	= DRIVER_NAME,

		.owner	= THIS_MODULE,

		.pm	= &omap_rtc_pm_ops,

		.of_match_table = of_match_ptr(omap_rtc_of_match),

	},

	.id_table	= omap_rtc_devtype,