mach-omap2/serial.c: fix minor bug and checkpatch warnings

omap_serial_init() in arch/arm/mach-omap2/serial.c clears the wrong
variable if it can't clk_get() a fclk - fix this.  Also fix some
checkpatch.pl warnings.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index 54ab7afab51b5e1d269611ccd89d04b1ec847ca2..33a30e1108b7f23aaf3984345da4369106975c4d 100644 (file)
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -18,7 +18,7 @@
 #include <linux/serial_reg.h>
 #include <linux/clk.h>
 
-#include <asm/io.h>
+#include <linux/io.h>
 
 #include <asm/arch/common.h>
 #include <asm/arch/board.h>
@@ -127,16 +127,15 @@ void __init omap_serial_init(void)
                if (IS_ERR(uart_ick[i])) {
                        printk(KERN_ERR "Could not get uart%d_ick\n", i+1);
                        uart_ick[i] = NULL;
-               }
-               else
+               } else
                        clk_enable(uart_ick[i]);
+
                sprintf(name, "uart%d_fck", i+1);
                uart_fck[i] = clk_get(NULL, name);
                if (IS_ERR(uart_fck[i])) {
                        printk(KERN_ERR "Could not get uart%d_fck\n", i+1);
-                       uart_ick[i] = NULL;
-               }
-               else
+                       uart_fck[i] = NULL;
+               } else
                        clk_enable(uart_fck[i]);
 
                omap_serial_reset(p);