Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fba9e072 authored by John Stultz's avatar John Stultz Committed by Ingo Molnar
Browse files

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: default avatarJohn 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: default avatarIngo Molnar <mingo@kernel.org>
parent 8cc8c525

arch/arm/plat-omap/counter_32k.c

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ int __init omap_init_clocksource_32k(void __iomem *vbase) 


	/*

	 * 120000 rough estimate from the calculations in

	 * __clocksource_updatefreq_scale.

	 * __clocksource_update_freq_scale.

	 */

	clocks_calc_mult_shift(&persistent_mult, &persistent_shift,

			32768, NSEC_PER_SEC, 120000);

drivers/clocksource/em_sti.c

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ static int em_sti_clocksource_enable(struct clocksource *cs) 


	ret = em_sti_start(p, USER_CLOCKSOURCE);

	if (!ret)

		__clocksource_updatefreq_hz(cs, p->rate);

		__clocksource_update_freq_hz(cs, p->rate);

	return ret;

}

drivers/clocksource/sh_cmt.c

+1 −1
Original line number Diff line number Diff line
@@ -641,7 +641,7 @@ static int sh_cmt_clocksource_enable(struct clocksource *cs) 


	ret = sh_cmt_start(ch, FLAG_CLOCKSOURCE);

	if (!ret) {

		__clocksource_updatefreq_hz(cs, ch->rate);

		__clocksource_update_freq_hz(cs, ch->rate);

		ch->cs_enabled = true;

	}

	return ret;

drivers/clocksource/sh_tmu.c

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ static int sh_tmu_clocksource_enable(struct clocksource *cs) 


	ret = sh_tmu_enable(ch);

	if (!ret) {

		__clocksource_updatefreq_hz(cs, ch->rate);

		__clocksource_update_freq_hz(cs, ch->rate);

		ch->cs_enabled = true;

	}

include/linux/clocksource.h

+5 −5
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ clocks_calc_mult_shift(u32 *mult, u32 *shift, u32 from, u32 to, u32 minsec); 
extern int

__clocksource_register_scale(struct clocksource *cs, u32 scale, u32 freq);

extern void

__clocksource_updatefreq_scale(struct clocksource *cs, u32 scale, u32 freq);

__clocksource_update_freq_scale(struct clocksource *cs, u32 scale, u32 freq);



/*

 * Don't call this unless you are a default clocksource
@@ -221,14 +221,14 @@ static inline int clocksource_register_khz(struct clocksource *cs, u32 khz) 
	return __clocksource_register_scale(cs, 1000, khz);

}



static inline void __clocksource_updatefreq_hz(struct clocksource *cs, u32 hz)

static inline void __clocksource_update_freq_hz(struct clocksource *cs, u32 hz)

{

	__clocksource_updatefreq_scale(cs, 1, hz);

	__clocksource_update_freq_scale(cs, 1, hz);

}



static inline void __clocksource_updatefreq_khz(struct clocksource *cs, u32 khz)

static inline void __clocksource_update_freq_khz(struct clocksource *cs, u32 khz)

{

	__clocksource_updatefreq_scale(cs, 1000, khz);

	__clocksource_update_freq_scale(cs, 1000, khz);

}