diff options
author | John Stultz <johnstul@us.ibm.com> | 2010-11-01 16:12:27 -0400 |
---|---|---|
committer | Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com> | 2011-01-13 14:41:11 -0500 |
commit | 1e2de47cddc70ae973cf468e2f2954b4ae80f4e3 (patch) | |
tree | 94449ebcdcf1328fe09fc7901abb799c34f72c5a /arch/avr32/kernel/time.c | |
parent | 992a88b62ca327f10d82dbad71a8c061d4229888 (diff) |
avr32: Convert to clocksource_register_hz
This converts the avr32 clocksource to use clocksource_register_hz.
This is untested, so any assistance in testing would be appreciated!
CC: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
CC: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Diffstat (limited to 'arch/avr32/kernel/time.c')
-rw-r--r-- | arch/avr32/kernel/time.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/avr32/kernel/time.c b/arch/avr32/kernel/time.c index 668ed2817e51..05ad29112ff4 100644 --- a/arch/avr32/kernel/time.c +++ b/arch/avr32/kernel/time.c | |||
@@ -35,7 +35,6 @@ static struct clocksource counter = { | |||
35 | .rating = 50, | 35 | .rating = 50, |
36 | .read = read_cycle_count, | 36 | .read = read_cycle_count, |
37 | .mask = CLOCKSOURCE_MASK(32), | 37 | .mask = CLOCKSOURCE_MASK(32), |
38 | .shift = 16, | ||
39 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, | 38 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, |
40 | }; | 39 | }; |
41 | 40 | ||
@@ -123,9 +122,7 @@ void __init time_init(void) | |||
123 | 122 | ||
124 | /* figure rate for counter */ | 123 | /* figure rate for counter */ |
125 | counter_hz = clk_get_rate(boot_cpu_data.clk); | 124 | counter_hz = clk_get_rate(boot_cpu_data.clk); |
126 | counter.mult = clocksource_hz2mult(counter_hz, counter.shift); | 125 | ret = clocksource_register_hz(&counter, counter_hz); |
127 | |||
128 | ret = clocksource_register(&counter); | ||
129 | if (ret) | 126 | if (ret) |
130 | pr_debug("timer: could not register clocksource: %d\n", ret); | 127 | pr_debug("timer: could not register clocksource: %d\n", ret); |
131 | 128 | ||