warnings: fix arch/x86/kernel/early_printk.c

[linux-2.6-omap-h63xx.git] / arch / x86 / kernel / early_printk.c

diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
index 28155acf706e8e9b6c4ae80298336f555558bc16..34ad997d3834dc773b71ae4f27e18828447d2853 100644 (file)
--- a/arch/x86/kernel/early_printk.c
+++ b/arch/x86/kernel/early_printk.c
@@ -120,7 +120,7 @@ static __init void early_serial_init(char *s)
                if (!strncmp(s, "0x", 2)) {
                        early_serial_base = simple_strtoul(s, &e, 16);
                } else {
-                       static int bases[] = { 0x3f8, 0x2f8 };
+                       static const int __initconst bases[] = { 0x3f8, 0x2f8 };
 
                        if (!strncmp(s, "ttyS", 4))
                                s += 4;
@@ -401,9 +401,9 @@ static int dbgp_control_msg(unsigned devnum, int requesttype, int request,
        /* Compute the control message */
        req.bRequestType = requesttype;
        req.bRequest = request;
-       req.wValue = value;
-       req.wIndex = index;
-       req.wLength = size;
+       req.wValue = cpu_to_le16(value);
+       req.wIndex = cpu_to_le16(index);
+       req.wLength = cpu_to_le16(size);
 
        pids = DBGP_PID_SET(USB_PID_DATA0, USB_PID_SETUP);
        addr = DBGP_EPADDR(devnum, 0);
@@ -842,7 +842,7 @@ static int __init early_dbgp_init(char *s)
        ret = ehci_setup();
        if (ret < 0) {
                dbgp_printk("ehci_setup failed\n");
-               ehci_debug = 0;
+               ehci_debug = NULL;
 
                return -1;
        }
@@ -920,7 +920,7 @@ static struct console simnow_console = {
 
 /* Direct interface for emergencies */
 static struct console *early_console = &early_vga_console;
-static int early_console_initialized;
+static int __initdata early_console_initialized;
 
 asmlinkage void early_printk(const char *fmt, ...)
 {
@@ -989,22 +989,4 @@ static int __init setup_early_printk(char *buf)
        return 0;
 }
 
-void __init enable_debug_console(char *buf)
-{
-#ifdef DBGP_DEBUG
-       struct console *old_early_console = NULL;
-
-       if (early_console_initialized && early_console) {
-               old_early_console = early_console;
-               unregister_console(early_console);
-               early_console_initialized = 0;
-       }
-
-       setup_early_printk(buf);
-
-       if (early_console == old_early_console && old_early_console)
-               register_console(old_early_console);
-#endif
-}
-
 early_param("earlyprintk", setup_early_printk);