aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2015-03-12 00:16:40 -0400
committerIngo Molnar <mingo@kernel.org>2015-03-13 03:07:08 -0400
commitfba9e07208c0f9d92d9f73761c99c8612039da44 (patch)
treeaaada64e62491aa6a8ee64ed18862bb502a81aa0 /drivers
parent8cc8c525ad4e7b581cacf84119e1a28dcb4044db (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 'drivers')
-rw-r--r--drivers/clocksource/em_sti.c2
-rw-r--r--drivers/clocksource/sh_cmt.c2
-rw-r--r--drivers/clocksource/sh_tmu.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/clocksource/em_sti.c b/drivers/clocksource/em_sti.c
index d0a7bd66b8b9..dc3c6ee04aaa 100644
--- a/drivers/clocksource/em_sti.c
+++ b/drivers/clocksource/em_sti.c
@@ -210,7 +210,7 @@ static int em_sti_clocksource_enable(struct clocksource *cs)
210 210
211 ret = em_sti_start(p, USER_CLOCKSOURCE); 211 ret = em_sti_start(p, USER_CLOCKSOURCE);
212 if (!ret) 212 if (!ret)
213 __clocksource_updatefreq_hz(cs, p->rate); 213 __clocksource_update_freq_hz(cs, p->rate);
214 return ret; 214 return ret;
215} 215}
216 216
diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c
index 2bd13b53b727..b8ff3c64cc45 100644
--- a/drivers/clocksource/sh_cmt.c
+++ b/drivers/clocksource/sh_cmt.c
@@ -641,7 +641,7 @@ static int sh_cmt_clocksource_enable(struct clocksource *cs)
641 641
642 ret = sh_cmt_start(ch, FLAG_CLOCKSOURCE); 642 ret = sh_cmt_start(ch, FLAG_CLOCKSOURCE);
643 if (!ret) { 643 if (!ret) {
644 __clocksource_updatefreq_hz(cs, ch->rate); 644 __clocksource_update_freq_hz(cs, ch->rate);
645 ch->cs_enabled = true; 645 ch->cs_enabled = true;
646 } 646 }
647 return ret; 647 return ret;
diff --git a/drivers/clocksource/sh_tmu.c b/drivers/clocksource/sh_tmu.c
index f150ca82bfaf..b6b8fa3cd211 100644
--- a/drivers/clocksource/sh_tmu.c
+++ b/drivers/clocksource/sh_tmu.c
@@ -272,7 +272,7 @@ static int sh_tmu_clocksource_enable(struct clocksource *cs)
272 272
273 ret = sh_tmu_enable(ch); 273 ret = sh_tmu_enable(ch);
274 if (!ret) { 274 if (!ret) {
275 __clocksource_updatefreq_hz(cs, ch->rate); 275 __clocksource_update_freq_hz(cs, ch->rate);
276 ch->cs_enabled = true; 276 ch->cs_enabled = true;
277 } 277 }
278 278