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

Commit 5fdade95 authored by Nicolas Pitre's avatar Nicolas Pitre Committed by Thomas Gleixner
Browse files

time: Rename misnamed minsec argument of clocks_calc_mult_shift() 



The minsec argument to clocks_calc_mult_shift() is misnamed. It is used 
to clamp the magnitude of the mult factor so that a multiplication with 
any value in the given range won't overflow a 64 bit result.  Let's 
rename it to match the actual usage.

Signed-off-by: default avatarNicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: default avatarJohn Stultz <johnstul@us.ibm.com>
LKML-Reference: <alpine.LFD.2.00.1101111207140.17086@xanadu.home>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent cb600d2f

kernel/time/clocksource.c

+4 −4
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ EXPORT_SYMBOL_GPL(timecounter_cyc2time); 
 * @shift:	pointer to shift variable

 * @from:	frequency to convert from

 * @to:		frequency to convert to

 * @minsec:	guaranteed runtime conversion range in seconds

 * @maxsec:	guaranteed runtime conversion range in seconds

 *

 * The function evaluates the shift/mult pair for the scaled math

 * operations of clocksources and clockevents.
@@ -122,7 +122,7 @@ EXPORT_SYMBOL_GPL(timecounter_cyc2time); 
 * NSEC_PER_SEC == 1GHz and @from is the counter frequency. For clock

 * event @to is the counter frequency and @from is NSEC_PER_SEC.

 *

 * The @minsec conversion range argument controls the time frame in

 * The @maxsec conversion range argument controls the time frame in

 * seconds which must be covered by the runtime conversion with the

 * calculated mult and shift factors. This guarantees that no 64bit

 * overflow happens when the input value of the conversion is
@@ -131,7 +131,7 @@ EXPORT_SYMBOL_GPL(timecounter_cyc2time); 
 * factors.

 */

void

clocks_calc_mult_shift(u32 *mult, u32 *shift, u32 from, u32 to, u32 minsec)

clocks_calc_mult_shift(u32 *mult, u32 *shift, u32 from, u32 to, u32 maxsec)

{

	u64 tmp;

	u32 sft, sftacc= 32;
@@ -140,7 +140,7 @@ clocks_calc_mult_shift(u32 *mult, u32 *shift, u32 from, u32 to, u32 minsec) 
	 * Calculate the shift factor which is limiting the conversion

	 * range:

	 */

	tmp = ((u64)minsec * from) >> 32;

	tmp = ((u64)maxsec * from) >> 32;

	while (tmp) {

		tmp >>=1;

		sftacc--;