From: Marek Vasut Date: Sun, 26 Jul 2015 09:11:28 +0000 (+0200) Subject: ddr: altera: Clean up of delay_for_n_mem_clocks() part 1 X-Git-Tag: v2015.10-rc2~220 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=90a584b76345d95f541e5843aba158ceb28a1271;p=oweals%2Fu-boot.git ddr: altera: Clean up of delay_for_n_mem_clocks() part 1 Fix data types, clean up comments a bit and fix coding style a bit. No functional change. Signed-off-by: Marek Vasut --- diff --git a/drivers/ddr/altera/sequencer.c b/drivers/ddr/altera/sequencer.c index 9470aca03d..5a6c99188a 100644 --- a/drivers/ddr/altera/sequencer.c +++ b/drivers/ddr/altera/sequencer.c @@ -758,40 +758,39 @@ static void set_jump_as_return(void) * should always use constants as argument to ensure all computations are * performed at compile time */ -static void delay_for_n_mem_clocks(const uint32_t clocks) +static void delay_for_n_mem_clocks(const u32 clocks) { - uint32_t afi_clocks; - uint8_t inner = 0; - uint8_t outer = 0; - uint16_t c_loop = 0; + u32 afi_clocks; + u16 c_loop = 0; + u8 inner = 0; + u8 outer = 0; debug("%s:%d: clocks=%u ... start\n", __func__, __LINE__, clocks); - - afi_clocks = (clocks + AFI_RATE_RATIO-1) / AFI_RATE_RATIO; /* scale (rounding up) to get afi clocks */ + afi_clocks = DIV_ROUND_UP(clocks, AFI_RATE_RATIO); /* - * Note, we don't bother accounting for being off a little bit - * because of a few extra instructions in outer loops - * Note, the loops have a test at the end, and do the test before - * the decrement, and so always perform the loop + * Note, we don't bother accounting for being off a little + * bit because of a few extra instructions in outer loops. + * Note, the loops have a test at the end, and do the test + * before the decrement, and so always perform the loop * 1 time more than the counter value */ if (afi_clocks == 0) { ; } else if (afi_clocks <= 0x100) { - inner = afi_clocks-1; + inner = afi_clocks - 1; outer = 0; c_loop = 0; } else if (afi_clocks <= 0x10000) { inner = 0xff; - outer = (afi_clocks-1) >> 8; + outer = (afi_clocks - 1) >> 8; c_loop = 0; } else { inner = 0xff; outer = 0xff; - c_loop = (afi_clocks-1) >> 16; + c_loop = (afi_clocks - 1) >> 16; } /*