summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-05-18 21:33:42 +0000
committerThomas Gleixner <tglx@linutronix.de>2011-05-19 14:24:16 +0200
commit61ee9a4ba05f0a4163d43a33dee7a0651e080b98 (patch)
treefa8c42f223acf3016db704790d240fbddd6da1cc /arch
parent80b816b736cfa5b9582279127099b20a479ab7d9 (diff)
downloadlinux-3.10-61ee9a4ba05f0a4163d43a33dee7a0651e080b98.tar.gz
linux-3.10-61ee9a4ba05f0a4163d43a33dee7a0651e080b98.tar.bz2
linux-3.10-61ee9a4ba05f0a4163d43a33dee7a0651e080b98.zip
x86: Convert PIT to clockevents_config_and_register()
Let the core do the work. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: John Stultz <john.stultz@linaro.org> Reviewed-by: Ingo Molnar <mingo@elte.hu> Link: http://lkml.kernel.org/r/%3C20110518210136.545615675%40linutronix.de%3E
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/i8253.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86/kernel/i8253.c b/arch/x86/kernel/i8253.c
index 577e90cadae..fb66dc9e36c 100644
--- a/arch/x86/kernel/i8253.c
+++ b/arch/x86/kernel/i8253.c
@@ -93,7 +93,6 @@ static struct clock_event_device pit_ce = {
.features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
.set_mode = init_pit_timer,
.set_next_event = pit_next_event,
- .shift = 32,
.irq = 0,
};
@@ -108,11 +107,8 @@ void __init setup_pit_timer(void)
* IO_APIC has been initialized.
*/
pit_ce.cpumask = cpumask_of(smp_processor_id());
- pit_ce.mult = div_sc(CLOCK_TICK_RATE, NSEC_PER_SEC, pit_ce.shift);
- pit_ce.max_delta_ns = clockevent_delta2ns(0x7FFF, &pit_ce);
- pit_ce.min_delta_ns = clockevent_delta2ns(0xF, &pit_ce);
- clockevents_register_device(&pit_ce);
+ clockevents_config_and_register(&pit_ce, CLOCK_TICK_RATE, 0xF, 0x7FFF);
global_clock_event = &pit_ce;
}