ARM: OMAP: Misc clean-up to sync with upstream patches

Based on comments from Russell King.

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

diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c
index 19a5f30..51f7030 100644 (file)
--- a/arch/arm/mach-omap2/control.c
+++ b/arch/arm/mach-omap2/control.c
@@ -49,25 +49,16 @@ u32 omap_ctrl_readl(u16 offset)
 
 void omap_ctrl_writeb(u8 val, u16 offset)
 {
-       pr_debug("omap_ctrl_writeb: writing 0x%0x to 0x%0x\n", val,
-                (__force u32)OMAP_CTRL_REGADDR(offset));
-
        __raw_writeb(val, OMAP_CTRL_REGADDR(offset));
 }
 
 void omap_ctrl_writew(u16 val, u16 offset)
 {
-       pr_debug("omap_ctrl_writew: writing 0x%0x to 0x%0x\n", val,
-                (__force u32)OMAP_CTRL_REGADDR(offset));
-
        __raw_writew(val, OMAP_CTRL_REGADDR(offset));
 }
 
 void omap_ctrl_writel(u32 val, u16 offset)
 {
-       pr_debug("omap_ctrl_writel: writing 0x%0x to 0x%0x\n", val,
-                (__force u32)OMAP_CTRL_REGADDR(offset));
-
        __raw_writel(val, OMAP_CTRL_REGADDR(offset));
 }
 

diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index 42c0359..fac8e99 100644 (file)
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -126,7 +126,7 @@ static int dma_chan_count;
 
 static spinlock_t dma_chan_lock;
 static struct omap_dma_lch *dma_chan;
-void __iomem *omap_dma_base;
+static void __iomem *omap_dma_base;
 
 static const u8 omap1_dma_irq[OMAP1_LOGICAL_DMA_CH_COUNT] = {
        INT_DMA_CH0_6, INT_DMA_CH1_7, INT_DMA_CH2_8, INT_DMA_CH3,

diff --git a/include/asm-arm/arch-omap/dma.h b/include/asm-arm/arch-omap/dma.h
index 9819f39..f4dcb95 100644 (file)
--- a/include/asm-arm/arch-omap/dma.h
+++ b/include/asm-arm/arch-omap/dma.h
@@ -474,8 +474,8 @@ struct omap_dma_channel_params {
 
 extern void omap_set_dma_priority(int lch, int dst_port, int priority);
 extern int omap_request_dma(int dev_id, const char *dev_name,
-                               void (*callback)(int lch, u16 ch_status,
-                               void *data), void *data, int *dma_ch);
+                       void (*callback)(int lch, u16 ch_status, void *data),
+                       void *data, int *dma_ch);
 extern void omap_enable_dma_irq(int ch, u16 irq_bits);
 extern void omap_disable_dma_irq(int ch, u16 irq_bits);
 extern void omap_free_dma(int ch);