From: Tony Lindgren <tony@atomide.com>
Date: Thu, 13 Mar 2008 12:49:25 +0000 (+0200)
Subject: ARM: OMAP2: Whitespace fixes for sending register access upstream
X-Git-Tag: v2.6.25-omap1~124
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c40ad8de1213c3198f2501e6d1526458ebcc37e9;p=linux-2.6-omap-h63xx.git

ARM: OMAP2: Whitespace fixes for sending register access upstream

Whitespace fixes for sending register access upstream

Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/mach-omap2/cm-regbits-34xx.h b/arch/arm/mach-omap2/cm-regbits-34xx.h
index fcb7c1297c2..fcc108dd2ae 100644
--- a/arch/arm/mach-omap2/cm-regbits-34xx.h
+++ b/arch/arm/mach-omap2/cm-regbits-34xx.h
@@ -457,7 +457,7 @@
 
 /* CM_FCLKEN_DSS */
 #define OMAP3430_EN_TV					(1 << 2)
-#define OMAP3430_EN_TV_SHIFT				       2
+#define OMAP3430_EN_TV_SHIFT				2
 #define OMAP3430_EN_DSS2				(1 << 1)
 #define OMAP3430_EN_DSS2_SHIFT				1
 #define OMAP3430_EN_DSS1				(1 << 0)
diff --git a/arch/arm/mach-omap2/cm.h b/arch/arm/mach-omap2/cm.h
index 8310e183b60..f575a87fc24 100644
--- a/arch/arm/mach-omap2/cm.h
+++ b/arch/arm/mach-omap2/cm.h
@@ -70,7 +70,7 @@ static u32 __attribute__((unused)) cm_read_reg(void __iomem *addr)
 #define CM_ICLKEN2					0x0014
 #define CM_ICLKEN3					0x0018
 #define CM_IDLEST1					0x0020
-#define CM_IDLEST                                       CM_IDLEST1
+#define CM_IDLEST					CM_IDLEST1
 #define CM_IDLEST2					0x0024
 #define CM_AUTOIDLE					0x0030
 #define CM_AUTOIDLE1					0x0030
@@ -94,7 +94,8 @@ static u32 __attribute__((unused)) cm_read_reg(void __iomem *addr)
 /* Clock management domain register get/set */
 
 #ifndef __ASSEMBLER__
-static void __attribute__((unused)) cm_write_mod_reg(u32 val, s16 module, s16 idx)
+static void __attribute__((unused)) cm_write_mod_reg(u32 val, s16 module,
+							s16 idx)
 {
 	cm_write_reg(val, OMAP_CM_REGADDR(module, idx));
 }
diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c
index 17ab129f4d5..a5d86a49c21 100644
--- a/arch/arm/mach-omap2/control.c
+++ b/arch/arm/mach-omap2/control.c
@@ -20,7 +20,8 @@
 
 static u32 omap2_ctrl_base;
 
-#define OMAP_CTRL_REGADDR(reg)	(void __iomem *)IO_ADDRESS(omap2_ctrl_base + reg)
+#define OMAP_CTRL_REGADDR(reg)	(void __iomem *)IO_ADDRESS(omap2_ctrl_base \
+								+ (reg))
 
 void omap_ctrl_base_set(u32 base)
 {