ARM: OMAP: Remove __atribute__(unused), use inline instead of __inline__

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / sdrc.h

diff --git a/arch/arm/mach-omap2/sdrc.h b/arch/arm/mach-omap2/sdrc.h
index d7f23bc9550a8a2266008f491b8824fffb39209f..896b578bcee6ae6614a6e29658172662fcc1529b 100644 (file)
--- a/arch/arm/mach-omap2/sdrc.h
+++ b/arch/arm/mach-omap2/sdrc.h
@@ -18,34 +18,38 @@
 #include <asm/arch/sdrc.h>
 
 #ifndef __ASSEMBLER__
-extern unsigned long omap2_sdrc_base;
-extern unsigned long omap2_sms_base;
+extern void __iomem *omap2_sdrc_base;
+extern void __iomem *omap2_sms_base;
 
-#define OMAP_SDRC_REGADDR(reg)                                         \
-               (void __iomem *)IO_ADDRESS(omap2_sdrc_base + (reg))
-#define OMAP_SMS_REGADDR(reg)                                          \
-               (void __iomem *)IO_ADDRESS(omap2_sms_base + (reg))
+#define OMAP_SDRC_REGADDR(reg)                 (omap2_sdrc_base + (reg))
+#define OMAP_SMS_REGADDR(reg)                  (omap2_sms_base + (reg))
 
 /* SDRC global register get/set */
 
-static inline void sdrc_write_reg(u32 val, u16 reg)
+static void sdrc_write_reg(u32 val, u16 reg)
 {
+       pr_debug("sdrc_write_reg: writing 0x%0x to 0x%0x\n", val,
+                (__force u32)OMAP_SDRC_REGADDR(reg));
+
        __raw_writel(val, OMAP_SDRC_REGADDR(reg));
 }
 
-static inline u32 sdrc_read_reg(u16 reg)
+static u32 sdrc_read_reg(u16 reg)
 {
        return __raw_readl(OMAP_SDRC_REGADDR(reg));
 }
 
 /* SMS global register get/set */
 
-static inline void sms_write_reg(u32 val, u16 reg)
+static void sms_write_reg(u32 val, u16 reg)
 {
+       pr_debug("sms_write_reg: writing 0x%0x to 0x%0x\n", val,
+                (__force u32)OMAP_SMS_REGADDR(reg));
+
        __raw_writel(val, OMAP_SMS_REGADDR(reg));
 }
 
-static inline u32 sms_read_reg(u16 reg)
+static u32 sms_read_reg(u16 reg)
 {
        return __raw_readl(OMAP_SMS_REGADDR(reg));
 }