* [patch 2.6.24-git] rtc: remove more dev->power.power_state usage
@ 2008-02-01 21:08 David Brownell
0 siblings, 0 replies; only message in thread
From: David Brownell @ 2008-02-01 21:08 UTC (permalink / raw)
To: Andrew Morton; +Cc: rtc-linux, lkml, Russell King
Remove some more references to dev->power.power_state. That field
is overdue for removal, but we can't do that while it's still
referenced in the kernel. The only reason to update it was to make
the /sys/devices/.../power/state files (now removed) work better.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
---
drivers/rtc/rtc-sa1100.c | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
--- at91.orig/drivers/rtc/rtc-sa1100.c 2008-02-01 12:31:16.000000000 -0800
+++ at91/drivers/rtc/rtc-sa1100.c 2008-02-01 12:32:14.000000000 -0800
@@ -357,23 +357,15 @@ static int sa1100_rtc_remove(struct plat
#ifdef CONFIG_PM
static int sa1100_rtc_suspend(struct platform_device *pdev, pm_message_t state)
{
- if (pdev->dev.power.power_state.event != state.event) {
- if (state.event == PM_EVENT_SUSPEND &&
- device_may_wakeup(&pdev->dev))
- enable_irq_wake(IRQ_RTCAlrm);
-
- pdev->dev.power.power_state = state;
- }
+ if (device_may_wakeup(&pdev->dev))
+ enable_irq_wake(IRQ_RTCAlrm);
return 0;
}
static int sa1100_rtc_resume(struct platform_device *pdev)
{
- if (pdev->dev.power.power_state.event != PM_EVENT_ON) {
- if (device_may_wakeup(&pdev->dev))
- disable_irq_wake(IRQ_RTCAlrm);
- pdev->dev.power.power_state = PMSG_ON;
- }
+ if (device_may_wakeup(&pdev->dev))
+ disable_irq_wake(IRQ_RTCAlrm);
return 0;
}
#else
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-02-01 21:13 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-02-01 21:08 [patch 2.6.24-git] rtc: remove more dev->power.power_state usage David Brownell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).