aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/i8253.c
diff options
context:
space:
mode:
authorJohn Stultz <johnstul@us.ibm.com>2010-04-26 22:03:05 -0400
committerJohn Stultz <john.stultz@linaro.org>2011-02-21 16:33:33 -0500
commitb01cc1b0eae0dea19257b29347116505fbedf679 (patch)
treee9666f32ab07306eca45ff8647eb09338a0cb697 /arch/x86/kernel/i8253.c
parent36d8593ec74dc04d3bd7c1c897a7b7cfbd0b0dc6 (diff)
x86: Convert remaining x86 clocksources to clocksource_register_hz/khz
This converts the remaining x86 clocksources to use clocksource_register_hz/khz. CC: jacob.jun.pan@intel.com CC: Glauber Costa <glommer@redhat.com> CC: Dimitri Sivanich <sivanich@sgi.com> CC: Rusty Russell <rusty@rustcorp.com.au> CC: Jeremy Fitzhardinge <jeremy@xensource.com> CC: Chris McDermott <lcm@us.ibm.com> CC: Thomas Gleixner <tglx@linutronix.de> Tested-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> [xen] Signed-off-by: John Stultz <johnstul@us.ibm.com>
Diffstat (limited to 'arch/x86/kernel/i8253.c')
-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 2dfd31597443..212fe6590aab 100644
--- a/arch/x86/kernel/i8253.c
+++ b/arch/x86/kernel/i8253.c
@@ -188,8 +188,6 @@ static struct clocksource pit_cs = {
188 .rating = 110, 188 .rating = 110,
189 .read = pit_read, 189 .read = pit_read,
190 .mask = CLOCKSOURCE_MASK(32), 190 .mask = CLOCKSOURCE_MASK(32),
191 .mult = 0,
192 .shift = 20,
193}; 191};
194 192
195static int __init init_pit_clocksource(void) 193static int __init init_pit_clocksource(void)
@@ -205,9 +203,7 @@ static int __init init_pit_clocksource(void)
205 pit_ce.mode != CLOCK_EVT_MODE_PERIODIC) 203 pit_ce.mode != CLOCK_EVT_MODE_PERIODIC)
206 return 0; 204 return 0;
207 205
208 pit_cs.mult = clocksource_hz2mult(CLOCK_TICK_RATE, pit_cs.shift); 206 return clocksource_register_hz(&pit_cs, CLOCK_TICK_RATE);
209
210 return clocksource_register(&pit_cs);
211} 207}
212arch_initcall(init_pit_clocksource); 208arch_initcall(init_pit_clocksource);
213 209