Commit b9d8c460 authored by Jingoo Han's avatar Jingoo Han Committed by Linus Torvalds

rtc: rtc-twl: convert twl4030rtc_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 ef69a7f0
...@@ -566,11 +566,10 @@ static void twl_rtc_shutdown(struct platform_device *pdev) ...@@ -566,11 +566,10 @@ static void twl_rtc_shutdown(struct platform_device *pdev)
mask_rtc_irq_bit(BIT_RTC_INTERRUPTS_REG_IT_TIMER_M); mask_rtc_irq_bit(BIT_RTC_INTERRUPTS_REG_IT_TIMER_M);
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static unsigned char irqstat; static unsigned char irqstat;
static int twl_rtc_suspend(struct platform_device *pdev, pm_message_t state) static int twl_rtc_suspend(struct device *dev)
{ {
irqstat = rtc_irq_bits; irqstat = rtc_irq_bits;
...@@ -578,17 +577,15 @@ static int twl_rtc_suspend(struct platform_device *pdev, pm_message_t state) ...@@ -578,17 +577,15 @@ static int twl_rtc_suspend(struct platform_device *pdev, pm_message_t state)
return 0; return 0;
} }
static int twl_rtc_resume(struct platform_device *pdev) static int twl_rtc_resume(struct device *dev)
{ {
set_rtc_irq_bit(irqstat); set_rtc_irq_bit(irqstat);
return 0; return 0;
} }
#else
#define twl_rtc_suspend NULL
#define twl_rtc_resume NULL
#endif #endif
static SIMPLE_DEV_PM_OPS(twl_rtc_pm_ops, twl_rtc_suspend, twl_rtc_resume);
#ifdef CONFIG_OF #ifdef CONFIG_OF
static const struct of_device_id twl_rtc_of_match[] = { static const struct of_device_id twl_rtc_of_match[] = {
{.compatible = "ti,twl4030-rtc", }, {.compatible = "ti,twl4030-rtc", },
...@@ -603,11 +600,10 @@ static struct platform_driver twl4030rtc_driver = { ...@@ -603,11 +600,10 @@ static struct platform_driver twl4030rtc_driver = {
.probe = twl_rtc_probe, .probe = twl_rtc_probe,
.remove = twl_rtc_remove, .remove = twl_rtc_remove,
.shutdown = twl_rtc_shutdown, .shutdown = twl_rtc_shutdown,
.suspend = twl_rtc_suspend,
.resume = twl_rtc_resume,
.driver = { .driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "twl_rtc", .name = "twl_rtc",
.pm = &twl_rtc_pm_ops,
.of_match_table = of_match_ptr(twl_rtc_of_match), .of_match_table = of_match_ptr(twl_rtc_of_match),
}, },
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment