diff options
author | John Stultz <john.stultz@linaro.org> | 2015-03-12 00:16:40 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-03-13 03:07:08 -0400 |
commit | fba9e07208c0f9d92d9f73761c99c8612039da44 (patch) | |
tree | aaada64e62491aa6a8ee64ed18862bb502a81aa0 /kernel/time | |
parent | 8cc8c525ad4e7b581cacf84119e1a28dcb4044db (diff) |
clocksource: Rename __clocksource_updatefreq_*() to __clocksource_update_freq_*()
Ingo requested this function be renamed to improve readability,
so I've renamed __clocksource_updatefreq_scale() as well as the
__clocksource_updatefreq_hz/khz() functions to avoid
squishedtogethernames.
This touches some of the sh clocksources, which I've not tested.
The arch/arm/plat-omap change is just a comment change for
consistency.
Signed-off-by: John Stultz <john.stultz@linaro.org>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Dave Jones <davej@codemonkey.org.uk>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1426133800-29329-13-git-send-email-john.stultz@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/time')
-rw-r--r-- | kernel/time/clocksource.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c index 1977ebabd922..c3be3c71bbad 100644 --- a/kernel/time/clocksource.c +++ b/kernel/time/clocksource.c | |||
@@ -643,7 +643,7 @@ static void clocksource_enqueue(struct clocksource *cs) | |||
643 | } | 643 | } |
644 | 644 | ||
645 | /** | 645 | /** |
646 | * __clocksource_updatefreq_scale - Used update clocksource with new freq | 646 | * __clocksource_update_freq_scale - Used update clocksource with new freq |
647 | * @cs: clocksource to be registered | 647 | * @cs: clocksource to be registered |
648 | * @scale: Scale factor multiplied against freq to get clocksource hz | 648 | * @scale: Scale factor multiplied against freq to get clocksource hz |
649 | * @freq: clocksource frequency (cycles per second) divided by scale | 649 | * @freq: clocksource frequency (cycles per second) divided by scale |
@@ -651,9 +651,10 @@ static void clocksource_enqueue(struct clocksource *cs) | |||
651 | * This should only be called from the clocksource->enable() method. | 651 | * This should only be called from the clocksource->enable() method. |
652 | * | 652 | * |
653 | * This *SHOULD NOT* be called directly! Please use the | 653 | * This *SHOULD NOT* be called directly! Please use the |
654 | * clocksource_updatefreq_hz() or clocksource_updatefreq_khz helper functions. | 654 | * __clocksource_update_freq_hz() or __clocksource_update_freq_khz() helper |
655 | * functions. | ||
655 | */ | 656 | */ |
656 | void __clocksource_updatefreq_scale(struct clocksource *cs, u32 scale, u32 freq) | 657 | void __clocksource_update_freq_scale(struct clocksource *cs, u32 scale, u32 freq) |
657 | { | 658 | { |
658 | u64 sec; | 659 | u64 sec; |
659 | 660 | ||
@@ -707,7 +708,7 @@ void __clocksource_updatefreq_scale(struct clocksource *cs, u32 scale, u32 freq) | |||
707 | pr_info("clocksource %s: mask: 0x%llx max_cycles: 0x%llx, max_idle_ns: %lld ns\n", | 708 | pr_info("clocksource %s: mask: 0x%llx max_cycles: 0x%llx, max_idle_ns: %lld ns\n", |
708 | cs->name, cs->mask, cs->max_cycles, cs->max_idle_ns); | 709 | cs->name, cs->mask, cs->max_cycles, cs->max_idle_ns); |
709 | } | 710 | } |
710 | EXPORT_SYMBOL_GPL(__clocksource_updatefreq_scale); | 711 | EXPORT_SYMBOL_GPL(__clocksource_update_freq_scale); |
711 | 712 | ||
712 | /** | 713 | /** |
713 | * __clocksource_register_scale - Used to install new clocksources | 714 | * __clocksource_register_scale - Used to install new clocksources |
@@ -724,7 +725,7 @@ int __clocksource_register_scale(struct clocksource *cs, u32 scale, u32 freq) | |||
724 | { | 725 | { |
725 | 726 | ||
726 | /* Initialize mult/shift and max_idle_ns */ | 727 | /* Initialize mult/shift and max_idle_ns */ |
727 | __clocksource_updatefreq_scale(cs, scale, freq); | 728 | __clocksource_update_freq_scale(cs, scale, freq); |
728 | 729 | ||
729 | /* Add clocksource to the clocksource list */ | 730 | /* Add clocksource to the clocksource list */ |
730 | mutex_lock(&clocksource_mutex); | 731 | mutex_lock(&clocksource_mutex); |