From: Tony Lindgren <tony@atomide.com>
Date: Mon, 14 Nov 2005 23:53:05 +0000 (-0800)
Subject: ARM: OMAP: Formatting changes to sync with mainline
X-Git-Tag: v2.6.15-omap2~96
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6d27ed91172aba00d12b9e3c1f135b523f9cb763;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Formatting changes to sync with mainline

Formatting changes to sync with mainline
---

diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index 907c0122a69..f5cc21ad095 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -153,7 +153,7 @@ void omap_set_dma_transfer_params(int lch, int data_type, int elem_count,
 	OMAP_DMA_CSDP_REG(lch) &= ~0x03;
 	OMAP_DMA_CSDP_REG(lch) |= data_type;
 
-	if (cpu_class_is_omap1()) {	
+	if (cpu_class_is_omap1()) {
 		OMAP_DMA_CCR_REG(lch) &= ~(1 << 5);
 		if (sync_mode == OMAP_DMA_SYNC_FRAME)
 			OMAP_DMA_CCR_REG(lch) |= 1 << 5;
@@ -247,7 +247,7 @@ void omap_set_dma_src_params(int lch, int src_port, int src_amode,
 
 	if (cpu_is_omap24xx())
 		OMAP2_DMA_CSSA_REG(lch) = src_start;
-		
+
 	OMAP_DMA_CSEI_REG(lch) = src_ei;
 	OMAP_DMA_CSFI_REG(lch) = src_fi;
 }
@@ -323,7 +323,7 @@ void omap_set_dma_dest_params(int lch, int dest_port, int dest_amode,
 	}
 
 	if (cpu_is_omap24xx())
-		OMAP2_DMA_CDSA_REG(lch) = dest_start;	
+		OMAP2_DMA_CDSA_REG(lch) = dest_start;
 
 	OMAP_DMA_CDEI_REG(lch) = dst_ei;
 	OMAP_DMA_CDFI_REG(lch) = dst_fi;
@@ -491,7 +491,7 @@ int omap_request_dma(int dev_id, const char *dev_name,
 
 	if (cpu_is_omap24xx()) {
 		omap2_enable_irq_lch(free_ch);
-		
+
 		omap_enable_channel_irq(free_ch);
 		/* Clear the CSR register and IRQ status register */
 		OMAP_DMA_CSR_REG(free_ch) = 0x0;
diff --git a/arch/arm/plat-omap/pm.c b/arch/arm/plat-omap/pm.c
index f646e99a872..8b6d9f91e95 100644
--- a/arch/arm/plat-omap/pm.c
+++ b/arch/arm/plat-omap/pm.c
@@ -134,7 +134,7 @@ static void omap_pm_wakeup_setup(void)
 		level1_wake = OMAP_IRQ_BIT(INT_730_GPIO_BANK1) |
 			OMAP_IRQ_BIT(INT_730_IH2_IRQ);
 	else if (cpu_is_omap1510())
-		level1_wake = OMAP_IRQ_BIT(INT_GPIO_BANK1) | 
+		level1_wake = OMAP_IRQ_BIT(INT_GPIO_BANK1) |
 			OMAP_IRQ_BIT(INT_1510_IH2_IRQ);
 	else if (cpu_is_omap16xx())
 		level1_wake = OMAP_IRQ_BIT(INT_GPIO_BANK1) |
diff --git a/include/asm-arm/arch-omap/entry-macro.S b/include/asm-arm/arch-omap/entry-macro.S
index e857ed9bf02..f8814a84910 100644
--- a/include/asm-arm/arch-omap/entry-macro.S
+++ b/include/asm-arm/arch-omap/entry-macro.S
@@ -12,7 +12,7 @@
 
 #if defined(CONFIG_ARCH_OMAP730) && \
 	(defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX))
-#error "FIXME: OMAP730 doesn't support multiple-OMAP"	
+#error "FIXME: OMAP730 doesn't support multiple-OMAP"
 #elif defined(CONFIG_ARCH_OMAP730)
 #define INT_IH2_IRQ		INT_730_IH2_IRQ
 #elif defined(CONFIG_ARCH_OMAP15XX)
diff --git a/include/asm-arm/arch-omap/mux.h b/include/asm-arm/arch-omap/mux.h
index ef4f6ead75e..13415a9aab0 100644
--- a/include/asm-arm/arch-omap/mux.h
+++ b/include/asm-arm/arch-omap/mux.h
@@ -104,11 +104,11 @@
 },
 
 
-/* 
+/*
  * OMAP730 has a slightly different config for the pin mux.
- * - config regs are the OMAP730_IO_CONF_x regs (see omap730.h) regs and 
+ * - config regs are the OMAP730_IO_CONF_x regs (see omap730.h) regs and
  *   not the FUNC_MUX_CTRL_x regs from hardware.h
- * - for pull-up/down, only has one enable bit which is is in the same register 
+ * - for pull-up/down, only has one enable bit which is is in the same register
  *   as mux config
  */
 #define MUX_CFG_730(desc, mux_reg, mode_offset, mode,	\
@@ -131,8 +131,8 @@
 	.mask		= mode,					\
 	.pull_val	= pull_en,				\
 	.pu_pd_val	= pull_mode,				\
-},	
-	 
+},
+
 
 #define PULL_DISABLED	0
 #define PULL_ENABLED	1
diff --git a/include/asm-arm/arch-omap/system.h b/include/asm-arm/arch-omap/system.h
index 90c2a059d99..b43cdd2a387 100644
--- a/include/asm-arm/arch-omap/system.h
+++ b/include/asm-arm/arch-omap/system.h
@@ -54,7 +54,7 @@ static inline void arch_reset(char mode)
 	if (!cpu_is_omap24xx())
 		omap1_arch_reset(mode);
 	else
-		omap2_arch_reset(mode);			
+		omap2_arch_reset(mode);
 }
 
 #endif
diff --git a/include/asm-arm/arch-omap/uncompress.h b/include/asm-arm/arch-omap/uncompress.h
index 9ea5144f1e2..c718264affb 100644
--- a/include/asm-arm/arch-omap/uncompress.h
+++ b/include/asm-arm/arch-omap/uncompress.h
@@ -35,7 +35,7 @@ putstr(const char *s)
 {
 	volatile u8 * uart = 0;
 	int shift = 2;
-	
+
 #ifdef CONFIG_MACH_OMAP_PALMTE
 	return;
 #endif