src/lib/clog2.c: Fix style and clarity, remove some cruft

Change-Id: I6b37cf945db12d2cf8096c9f49fff9e0bec139d6
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-on: http://review.coreboot.org/6058
Tested-by: build bot (Jenkins)
Reviewed-by: Idwer Vollering <vidwer@gmail.com>
This commit is contained in:
Edward O'Callaghan 2014-06-17 18:53:36 +10:00 committed by Kyösti Mälkki
parent 669cb2f0c4
commit 8fac0b3e90
1 changed files with 11 additions and 18 deletions

View File

@ -1,9 +1,4 @@
#undef DEBUG_LOG2
#ifdef DEBUG_LOG2
#include <console/console.h> #include <console/console.h>
#endif
#include <lib.h> #include <lib.h>
/* Assume 8 bits per byte */ /* Assume 8 bits per byte */
@ -11,28 +6,26 @@
unsigned long log2(unsigned long x) unsigned long log2(unsigned long x)
{ {
// assume 8 bits per byte. /* assume 8 bits per byte. */
unsigned long i = 1ULL << (sizeof(x)* CHAR_BIT - 1ULL); unsigned long pow = sizeof(x) * CHAR_BIT - 1ULL;
unsigned long pow = sizeof(x) * CHAR_BIT - 1ULL; unsigned long i = 1ULL << pow;
if (! x) { if (!x) {
#ifdef DEBUG_LOG2 printk(BIOS_WARNING, "%s called with invalid parameter of 0\n",
printk(BIOS_WARNING, "%s called with invalid parameter of 0\n",
__func__); __func__);
#endif return -1;
return -1; }
}
for(; i > x; i >>= 1, pow--)
;
return pow; for (; i > x; i >>= 1, pow--);
return pow;
} }
unsigned long log2_ceil(unsigned long x) unsigned long log2_ceil(unsigned long x)
{ {
unsigned long pow; unsigned long pow;
if (! x) if (!x)
return -1; return -1;
pow = log2(x); pow = log2(x);