Sync with mainline: Tabify more

Tabify more

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

diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index 69e400bafb7840fd63d75b7ee97d877d7cd67fdc..2d86b106ff3e06b0dbc9ffe3a8e84b0945fb96b0 100644 (file)
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -933,7 +933,7 @@ static int omap2_dma_handle_ch(int ch)
        if (unlikely(dma_chan[ch].dev_id == -1)) {
                if (printk_ratelimit())
                        printk(KERN_WARNING "IRQ %04x for non-allocated DMA"
-                              "channel %d\n", status, ch);
+                                       "channel %d\n", status, ch);
                return 0;
        }
        if (unlikely(status & OMAP_DMA_DROP_IRQ))

diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
index ce7146ecc3c8b3cd2241721c92930f6a5d8e40da..3d7ed6979aea40580cd67a6e28ebc74bce8e9dd6 100644 (file)
--- a/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
@@ -1514,9 +1514,9 @@ void omap2_gpio_resume_after_retention(void)
                if (!(bank->enabled_non_wakeup_gpios))
                        continue;
                __raw_writel(bank->saved_fallingdetect,
-                            bank->base + OMAP24XX_GPIO_FALLINGDETECT);
+                                bank->base + OMAP24XX_GPIO_FALLINGDETECT);
                __raw_writel(bank->saved_risingdetect,
-                            bank->base + OMAP24XX_GPIO_RISINGDETECT);
+                                bank->base + OMAP24XX_GPIO_RISINGDETECT);
                /* Check if any of the non-wakeup interrupt GPIOs have changed
                 * state.  If so, generate an IRQ by software.  This is
                 * horribly racy, but it's the best we can do to work around
@@ -1701,7 +1701,7 @@ static const struct file_operations debug_fops = {
 static int __init omap_gpio_debuginit(void)
 {
        (void) debugfs_create_file("omap_gpio", S_IRUGO,
-                                  NULL, NULL, &debug_fops);
+                                       NULL, NULL, &debug_fops);
        return 0;
 }
 late_initcall(omap_gpio_debuginit);

diff --git a/arch/arm/plat-omap/mux.c b/arch/arm/plat-omap/mux.c
index 7e91779fe5c9dcc47691fb0ed8071b54a053584d..8f7e0fea8bc23b4db1b6700d0a691f1247abf36b 100644 (file)
--- a/arch/arm/plat-omap/mux.c
+++ b/arch/arm/plat-omap/mux.c
@@ -94,9 +94,9 @@ int __init_or_module omap_cfg_reg(const unsigned long index)
                        warn = (orig != reg);
                        if (debug || warn)
                                printk("MUX: setup %s (0x%08x): 0x%02x -> 0x%02x\n",
-                                      cfg->name,
-                                      OMAP24XX_L4_BASE + cfg->mux_reg,
-                                      orig, reg);
+                                               cfg->name,
+                                               OMAP24XX_L4_BASE + cfg->mux_reg,
+                                               orig, reg);
                }
 #endif
                omap_writeb(reg, OMAP24XX_L4_BASE + cfg->mux_reg);