Commit 71b5280b authored by Viresh Kumar's avatar Viresh Kumar Committed by Daniel Lezcano

um/time: Migrate to new 'set-state' interface

Migrate um driver to the new 'set-state' interface provided by
clockevents core, the earlier 'set-mode' interface is marked obsolete
now.

This also enables us to implement callbacks for new states of clockevent
devices, for example: ONESHOT_STOPPED.

Cc: Jeff Dike <jdike@addtoit.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: user-mode-linux-devel@lists.sourceforge.net
Cc: user-mode-linux-user@lists.sourceforge.net
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent ff4aea45
...@@ -22,23 +22,16 @@ void timer_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs) ...@@ -22,23 +22,16 @@ void timer_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs)
local_irq_restore(flags); local_irq_restore(flags);
} }
static void itimer_set_mode(enum clock_event_mode mode, static int itimer_shutdown(struct clock_event_device *evt)
struct clock_event_device *evt)
{ {
switch (mode) {
case CLOCK_EVT_MODE_PERIODIC:
set_interval();
break;
case CLOCK_EVT_MODE_SHUTDOWN:
case CLOCK_EVT_MODE_UNUSED:
case CLOCK_EVT_MODE_ONESHOT:
disable_timer(); disable_timer();
break; return 0;
}
case CLOCK_EVT_MODE_RESUME: static int itimer_set_periodic(struct clock_event_device *evt)
break; {
} set_interval();
return 0;
} }
static int itimer_next_event(unsigned long delta, static int itimer_next_event(unsigned long delta,
...@@ -51,8 +44,11 @@ static struct clock_event_device itimer_clockevent = { ...@@ -51,8 +44,11 @@ static struct clock_event_device itimer_clockevent = {
.name = "itimer", .name = "itimer",
.rating = 250, .rating = 250,
.cpumask = cpu_all_mask, .cpumask = cpu_all_mask,
.features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, .features = CLOCK_EVT_FEAT_PERIODIC |
.set_mode = itimer_set_mode, CLOCK_EVT_FEAT_ONESHOT,
.set_state_shutdown = itimer_shutdown,
.set_state_periodic = itimer_set_periodic,
.set_state_oneshot = itimer_shutdown,
.set_next_event = itimer_next_event, .set_next_event = itimer_next_event,
.shift = 32, .shift = 32,
.irq = 0, .irq = 0,
......
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