Commit 59ca5c4b authored by Tony Lindgren's avatar Tony Lindgren

Sync with mainline: Tabify more

Tabify more
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 6213f590
...@@ -933,7 +933,7 @@ static int omap2_dma_handle_ch(int ch) ...@@ -933,7 +933,7 @@ static int omap2_dma_handle_ch(int ch)
if (unlikely(dma_chan[ch].dev_id == -1)) { if (unlikely(dma_chan[ch].dev_id == -1)) {
if (printk_ratelimit()) if (printk_ratelimit())
printk(KERN_WARNING "IRQ %04x for non-allocated DMA" printk(KERN_WARNING "IRQ %04x for non-allocated DMA"
"channel %d\n", status, ch); "channel %d\n", status, ch);
return 0; return 0;
} }
if (unlikely(status & OMAP_DMA_DROP_IRQ)) if (unlikely(status & OMAP_DMA_DROP_IRQ))
......
...@@ -1514,9 +1514,9 @@ void omap2_gpio_resume_after_retention(void) ...@@ -1514,9 +1514,9 @@ void omap2_gpio_resume_after_retention(void)
if (!(bank->enabled_non_wakeup_gpios)) if (!(bank->enabled_non_wakeup_gpios))
continue; continue;
__raw_writel(bank->saved_fallingdetect, __raw_writel(bank->saved_fallingdetect,
bank->base + OMAP24XX_GPIO_FALLINGDETECT); bank->base + OMAP24XX_GPIO_FALLINGDETECT);
__raw_writel(bank->saved_risingdetect, __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 /* Check if any of the non-wakeup interrupt GPIOs have changed
* state. If so, generate an IRQ by software. This is * state. If so, generate an IRQ by software. This is
* horribly racy, but it's the best we can do to work around * horribly racy, but it's the best we can do to work around
...@@ -1701,7 +1701,7 @@ static const struct file_operations debug_fops = { ...@@ -1701,7 +1701,7 @@ static const struct file_operations debug_fops = {
static int __init omap_gpio_debuginit(void) static int __init omap_gpio_debuginit(void)
{ {
(void) debugfs_create_file("omap_gpio", S_IRUGO, (void) debugfs_create_file("omap_gpio", S_IRUGO,
NULL, NULL, &debug_fops); NULL, NULL, &debug_fops);
return 0; return 0;
} }
late_initcall(omap_gpio_debuginit); late_initcall(omap_gpio_debuginit);
......
...@@ -94,9 +94,9 @@ int __init_or_module omap_cfg_reg(const unsigned long index) ...@@ -94,9 +94,9 @@ int __init_or_module omap_cfg_reg(const unsigned long index)
warn = (orig != reg); warn = (orig != reg);
if (debug || warn) if (debug || warn)
printk("MUX: setup %s (0x%08x): 0x%02x -> 0x%02x\n", printk("MUX: setup %s (0x%08x): 0x%02x -> 0x%02x\n",
cfg->name, cfg->name,
OMAP24XX_L4_BASE + cfg->mux_reg, OMAP24XX_L4_BASE + cfg->mux_reg,
orig, reg); orig, reg);
} }
#endif #endif
omap_writeb(reg, OMAP24XX_L4_BASE + cfg->mux_reg); omap_writeb(reg, OMAP24XX_L4_BASE + cfg->mux_reg);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment