mach-omap2: fix sparse warnings, some style issues for OMAP2 builds

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / board-n800-audio.c

diff --git a/arch/arm/mach-omap2/board-n800-audio.c b/arch/arm/mach-omap2/board-n800-audio.c
index bebc4a50b0b387b490df4106135cd55a8085ddc7..233198edbd577ca0db8c577442132fe8177d4caf 100644 (file)
--- a/arch/arm/mach-omap2/board-n800-audio.c
+++ b/arch/arm/mach-omap2/board-n800-audio.c
@@ -54,11 +54,13 @@ static int eac_mux_disabled = 0;
 static int clkout2_mux_disabled = 0;
 static u32 saved_mux[2];
 
+#define MUX_EAC_IOP2V(x)               (__force void __iomem *)io_p2v(x)
+
 static void n800_enable_eac_mux(void)
 {
        if (!eac_mux_disabled)
                return;
-       __raw_writel(saved_mux[1], IO_ADDRESS(0x48000124));
+       __raw_writel(saved_mux[1], MUX_EAC_IOP2V(0x48000124));
        eac_mux_disabled = 0;
 }
 
@@ -68,8 +70,8 @@ static void n800_disable_eac_mux(void)
                WARN_ON(eac_mux_disabled);
                return;
        }
-       saved_mux[1] = __raw_readl(IO_ADDRESS(0x48000124));
-       __raw_writel(0x1f1f1f1f, IO_ADDRESS(0x48000124));
+       saved_mux[1] = __raw_readl(MUX_EAC_IOP2V(0x48000124));
+       __raw_writel(0x1f1f1f1f, MUX_EAC_IOP2V(0x48000124));
        eac_mux_disabled = 1;
 }
 
@@ -77,7 +79,7 @@ static void n800_enable_clkout2_mux(void)
 {
        if (!clkout2_mux_disabled)
                return;
-       __raw_writel(saved_mux[0], IO_ADDRESS(0x480000e8));
+       __raw_writel(saved_mux[0], MUX_EAC_IOP2V(0x480000e8));
        clkout2_mux_disabled = 0;
 }
 
@@ -89,10 +91,10 @@ static void n800_disable_clkout2_mux(void)
                WARN_ON(clkout2_mux_disabled);
                return;
        }
-       saved_mux[0] = __raw_readl(IO_ADDRESS(0x480000e8));
+       saved_mux[0] = __raw_readl(MUX_EAC_IOP2V(0x480000e8));
        l = saved_mux[0] & ~0xff;
        l |= 0x1f;
-       __raw_writel(l, IO_ADDRESS(0x480000e8));
+       __raw_writel(l, MUX_EAC_IOP2V(0x480000e8));
        clkout2_mux_disabled = 1;
 }