Commit-ID: 027f6ad7bfa97cf8f75e9d81c15256d828eb0809
Gitweb: http://git.kernel.org/tip/027f6ad7bfa97cf8f75e9d81c15256d828eb0809
Author: John Stultz <johnstul@xxxxxxxxxx>
AuthorDate: Tue, 19 Oct 2010 17:58:48 -0700
Committer: John Stultz <john.stultz@xxxxxxxxxx>
CommitDate: Mon, 21 Nov 2011 19:01:05 -0800
clocksource: cris: Convert to clocksource_register_khz
This converts the cris architecture to use clocksource_register_khz
This is untested, so any help from maintainers would be appreciated.
CC: Mikael Starvik <starvik@xxxxxxxx>
CC: Jesper Nilsson <jesper.nilsson@xxxxxxxx>
CC: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: John Stultz <johnstul@xxxxxxxxxx>
---
arch/cris/arch-v32/kernel/time.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/arch/cris/arch-v32/kernel/time.c b/arch/cris/arch-v32/kernel/time.c
index bb978ed..6773fc8 100644
--- a/arch/cris/arch-v32/kernel/time.c
+++ b/arch/cris/arch-v32/kernel/time.c
@@ -47,14 +47,12 @@ static struct clocksource cont_rotime = {
.rating = 300,
.read = read_cont_rotime,
.mask = CLOCKSOURCE_MASK(32),
- .shift = 10,
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
};
static int __init etrax_init_cont_rotime(void)
{
- cont_rotime.mult = clocksource_khz2mult(100000, cont_rotime.shift);
- clocksource_register(&cont_rotime);
+ clocksource_register_khz(&cont_rotime, 100000);
return 0;
}
arch_initcall(etrax_init_cont_rotime);
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|