]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
x86: coding style fixes to arch/x86/kernel/early_printk.c
authorPaolo Ciarrocchi <paolo.ciarrocchi@gmail.com>
Fri, 29 Feb 2008 12:25:30 +0000 (13:25 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 17 Apr 2008 15:40:51 +0000 (17:40 +0200)
Before:
total: 17 errors, 3 warnings, 254 lines checked

After:
total: 2 errors, 3 warnings, 254 lines checked

paolo@paolo-desktop:/tmp/b$ md5sum *
da32f5cd8f248970e4809e1005393e95  early_printk.o.after
da32f5cd8f248970e4809e1005393e95  early_printk.o.before

paolo@paolo-desktop:/tmp/b$ size *
   text    data     bss     dec     hex filename
   1172     280      12    1464     5b8 early_printk.o.after
   1172     280      12    1464     5b8 early_printk.o.befor

Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/early_printk.c

index cff84cd9987f37270689154df1e07db469a4f9df..a8f965dd58df3df9b0bb1ad3c950274d45ac74c2 100644 (file)
@@ -108,12 +108,12 @@ static __init void early_serial_init(char *s)
 
        if (*s) {
                unsigned port;
-               if (!strncmp(s,"0x",2)) {
+               if (!strncmp(s, "0x", 2)) {
                        early_serial_base = simple_strtoul(s, &e, 16);
                } else {
                        static int bases[] = { 0x3f8, 0x2f8 };
 
-                       if (!strncmp(s,"ttyS",4))
+                       if (!strncmp(s, "ttyS", 4))
                                s += 4;
                        port = simple_strtoul(s, &e, 10);
                        if (port > 1 || s == e)
@@ -202,9 +202,9 @@ void early_printk(const char *fmt, ...)
        int n;
        va_list ap;
 
-       va_start(ap,fmt);
-       n = vscnprintf(buf,512,fmt,ap);
-       early_console->write(early_console,buf,n);
+       va_start(ap, fmt);
+       n = vscnprintf(buf, 512, fmt, ap);
+       early_console->write(early_console, buf, n);
        va_end(ap);
 }
 
@@ -229,15 +229,15 @@ static int __init setup_early_printk(char *buf)
                early_serial_init(buf);
                early_console = &early_serial_console;
        } else if (!strncmp(buf, "vga", 3)
-                  && boot_params.screen_info.orig_video_isVGA == 1) {
+               && boot_params.screen_info.orig_video_isVGA == 1) {
                max_xpos = boot_params.screen_info.orig_video_cols;
                max_ypos = boot_params.screen_info.orig_video_lines;
                current_ypos = boot_params.screen_info.orig_y;
                early_console = &early_vga_console;
-       } else if (!strncmp(buf, "simnow", 6)) {
-               simnow_init(buf + 6);
-               early_console = &simnow_console;
-               keep_early = 1;
+       } else if (!strncmp(buf, "simnow", 6)) {
+               simnow_init(buf + 6);
+               early_console = &simnow_console;
+               keep_early = 1;
 #ifdef CONFIG_HVC_XEN
        } else if (!strncmp(buf, "xen", 3)) {
                early_console = &xenboot_console;