[PATCH] clockevents: check 'state' instead of 'mode' in suspend/resume path

From: Viresh Kumar
Date: Wed Jun 17 2015 - 06:35:21 EST

CLOCK_EVT_MODE_* macros are present for backward compatibility (as most
of the drivers are still using old ->set_mode() interface).

These macro's shouldn't be used anymore in code, that is common to both
driver interfaces, i.e. ->set_mode() and ->set_state_*().

Drivers implementing ->set_state_*() interface, which have their
clkevt->mode set to 0 (clkevt device structures are normally globally
defined), will not participate in suspend/resume as they will always be
marked as UNUSED.

Fix this by checking state of the clockevent device instead of mode,
which is updated for both the interfaces.

Fixes: ac34ad27fc16 ("clockevents: Do not suspend/resume if unused")
Signed-off-by: Viresh Kumar <viresh.kumar@xxxxxxxxxx>
kernel/time/clockevents.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/time/clockevents.c b/kernel/time/clockevents.c
index 2397b97320d8..08ccc3da3ca0 100644
--- a/kernel/time/clockevents.c
+++ b/kernel/time/clockevents.c
@@ -639,7 +639,7 @@ void clockevents_suspend(void)
struct clock_event_device *dev;

list_for_each_entry_reverse(dev, &clockevent_devices, list)
- if (dev->suspend && dev->mode != CLOCK_EVT_MODE_UNUSED)
+ if (dev->suspend && !clockevent_state_detached(dev))

@@ -651,7 +651,7 @@ void clockevents_resume(void)
struct clock_event_device *dev;

list_for_each_entry(dev, &clockevent_devices, list)
- if (dev->resume && dev->mode != CLOCK_EVT_MODE_UNUSED)
+ if (dev->resume && !clockevent_state_detached(dev))


To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/