diff options
| author | John Stultz <johnstul@us.ibm.com> | 2010-04-26 20:20:47 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-02-21 13:33:45 -0800 |
| commit | d60c3041778c11f564969fb62b337df68232ee80 (patch) | |
| tree | 67154170286795c1414b7c7bd19c3e24a75b49eb /drivers/char | |
| parent | b01cc1b0eae0dea19257b29347116505fbedf679 (diff) | |
| download | talos-op-linux-d60c3041778c11f564969fb62b337df68232ee80.tar.gz talos-op-linux-d60c3041778c11f564969fb62b337df68232ee80.zip | |
ia64: convert to clocksource_register_hz/khz
This converts the ia64 clocksources to use clocksource_register_hz/khz
CC: Tony Luck <tony.luck@intel.com>
CC: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Tony Luck <tony.luck@intel.com> [clocksource_itc path]
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/hpet.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c index 7066e801b9d3..051474c65b78 100644 --- a/drivers/char/hpet.c +++ b/drivers/char/hpet.c @@ -84,8 +84,6 @@ static struct clocksource clocksource_hpet = { .rating = 250, .read = read_hpet, .mask = CLOCKSOURCE_MASK(64), - .mult = 0, /* to be calculated */ - .shift = 10, .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; static struct clocksource *hpet_clocksource; @@ -934,9 +932,7 @@ int hpet_alloc(struct hpet_data *hdp) if (!hpet_clocksource) { hpet_mctr = (void __iomem *)&hpetp->hp_hpet->hpet_mc; CLKSRC_FSYS_MMIO_SET(clocksource_hpet.fsys_mmio, hpet_mctr); - clocksource_hpet.mult = clocksource_hz2mult(hpetp->hp_tick_freq, - clocksource_hpet.shift); - clocksource_register(&clocksource_hpet); + clocksource_register_hz(&clocksource_hpet, hpetp->hp_tick_freq); hpetp->hp_clocksource = &clocksource_hpet; hpet_clocksource = &clocksource_hpet; } |
