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

Commit 14ea58ad authored by Julia Lawall's avatar Julia Lawall Committed by Benjamin Herrenschmidt
Browse files

powerpc: Use DIV_ROUND_CLOSEST in time init code 

The kernel.h macro DIV_ROUND_CLOSEST performs the computation (x + d/2)/d
but is perhaps more readable.

The semantic patch that makes this change is as follows:
(http://www.emn.fr/x-info/coccinelle/

)

// <smpl>
@haskernel@
@@

#include <linux/kernel.h>

@depends on haskernel@
expression x,__divisor;
@@

- (((x) + ((__divisor) / 2)) / (__divisor))
+ DIV_ROUND_CLOSEST(x,__divisor)
// </smpl>

Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 9413c883

arch/powerpc/kernel/time.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -479,7 +479,8 @@ static int __init iSeries_tb_recal(void) 
		unsigned long tb_ticks = tb - iSeries_recal_tb;

		unsigned long tb_ticks = tb - iSeries_recal_tb;

		unsigned long titan_usec = (titan - iSeries_recal_titan) >> 12;

		unsigned long titan_usec = (titan - iSeries_recal_titan) >> 12;

		unsigned long new_tb_ticks_per_sec   = (tb_ticks * USEC_PER_SEC)/titan_usec;

		unsigned long new_tb_ticks_per_sec   = (tb_ticks * USEC_PER_SEC)/titan_usec;

		unsigned long new_tb_ticks_per_jiffy = (new_tb_ticks_per_sec+(HZ/2))/HZ;

		unsigned long new_tb_ticks_per_jiffy =

			DIV_ROUND_CLOSEST(new_tb_ticks_per_sec, HZ);

		long tick_diff = new_tb_ticks_per_jiffy - tb_ticks_per_jiffy;

		long tick_diff = new_tb_ticks_per_jiffy - tb_ticks_per_jiffy;

		char sign = '+';		

		char sign = '+';		

		/* make sure tb_ticks_per_sec and tb_ticks_per_jiffy are consistent */

		/* make sure tb_ticks_per_sec and tb_ticks_per_jiffy are consistent */