leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
This commit is contained in:
Viresh Kumar 2015-07-16 16:56:31 +05:30 committed by Daniel Lezcano
parent ff4aea45c7
commit 71b5280b79
1 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
arch/um/kernel/time.c
View File

@ -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) { disable_timer();
case CLOCK_EVT_MODE_PERIODIC: return 0;
set_interval(); }
break;
case CLOCK_EVT_MODE_SHUTDOWN: static int itimer_set_periodic(struct clock_event_device *evt)
case CLOCK_EVT_MODE_UNUSED: {
case CLOCK_EVT_MODE_ONESHOT: set_interval();
disable_timer(); return 0;
break;
case CLOCK_EVT_MODE_RESUME:
break;
}
} }
static int itimer_next_event(unsigned long delta, static int itimer_next_event(unsigned long delta,
@ -48,14 +41,17 @@ static int itimer_next_event(unsigned long delta,
} }
static struct clock_event_device itimer_clockevent = { 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_next_event = itimer_next_event, .set_state_shutdown = itimer_shutdown,
.shift = 32, .set_state_periodic = itimer_set_periodic,
.irq = 0, .set_state_oneshot = itimer_shutdown,
.set_next_event = itimer_next_event,
.shift = 32,
.irq = 0,
}; };
static irqreturn_t um_timer(int irq, void *dev) static irqreturn_t um_timer(int irq, void *dev)