printk_foo -> printk(BIOS_FOO, ...)

[coreboot.git] / src / lib / clog2.c

diff --git a/src/lib/clog2.c b/src/lib/clog2.c
index 41e2af9791d2f9cd031e2c5afbf9ab835ab47fbb..c6fe6f6cc87f81ac062f24c5fb07dd3f325dd93d 100644 (file)
--- a/src/lib/clog2.c
+++ b/src/lib/clog2.c
@@ -4,16 +4,21 @@
 #include <console/console.h>
 #endif
 
+#include <lib.h>
+
+/* Assume 8 bits per byte */
+#define CHAR_BIT 8
+
 unsigned long log2(unsigned long x)
 {
         // assume 8 bits per byte.
-        unsigned long i = 1 << (sizeof(x)*8 - 1);
-        unsigned long pow = sizeof(x) * 8 - 1;
+        unsigned long i = 1ULL << (sizeof(x)* CHAR_BIT - 1ULL);
+        unsigned long pow = sizeof(x) * CHAR_BIT - 1ULL;
 
         if (! x) {
 #ifdef DEBUG_LOG2
-                printk_warning("%s called with invalid parameter of 0\n",
-                       __FUNCTION__);
+                printk(BIOS_WARNING, "%s called with invalid parameter of 0\n",
+                       __func__);
 #endif
                 return -1;
         }