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 907c0122a694189ad080af49f8992df6a8d98b70..f5cc21ad09565cba72c2e1c46fd921919b8e1612 100644 (file)
--- 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 f646e99a8729eef32644917ef5046cc0e9917733..8b6d9f91e95ddc0ec7adb5eed2c0f725ba92b064 100644 (file)
--- 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 e857ed9bf02b79786452c75f8dca56e3006fb06d..f8814a84910e4025371ef44c6b2ee4fa434dbecd 100644 (file)
--- 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 ef4f6ead75e81309673a8d57e680424b47bc4976..13415a9aab06431540e6e045a0d7988c7c711154 100644 (file)
--- 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 90c2a059d9956766c439255c55febb69d909fbd1..b43cdd2a3874d7ead25b237d2b1c30d18512bfca 100644 (file)
--- 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 9ea5144f1e29205120f75a665a676d2b32f28dcb..c718264affbd1fd7672faf887efb5fd6eb2164e6 100644 (file)
--- 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