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

As requested by RMK earlier.

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

diff --git a/arch/arm/mach-omap2/cm.h b/arch/arm/mach-omap2/cm.h
index da5e83a..bd7bd6e 100644 (file)
--- a/arch/arm/mach-omap2/cm.h
+++ b/arch/arm/mach-omap2/cm.h
@@ -39,8 +39,7 @@
 #ifndef __ASSEMBLER__
 
 /* Read-modify-write bits in a CM register */
-static __inline__ u32 __attribute__((unused)) cm_rmw_reg_bits(u32 mask,
-                                               u32 bits, void __iomem *va)
+static inline u32 cm_rmw_reg_bits(u32 mask, u32 bits, void __iomem *va)
 {
        u32 v;
 
@@ -115,14 +114,12 @@ extern u32 cm_read_mod_reg(s16 module, u16 idx);
 extern void cm_write_mod_reg(u32 val, s16 module, u16 idx);
 extern u32 cm_rmw_mod_reg_bits(u32 mask, u32 bits, s16 module, s16 idx);
 
-static __inline__ u32 __attribute__((unused)) cm_set_mod_reg_bits(u32 bits,
-                                                       s16 module, s16 idx)
+static inline u32 cm_set_mod_reg_bits(u32 bits, s16 module, s16 idx)
 {
        return cm_rmw_mod_reg_bits(bits, bits, module, idx);
 }
 
-static __inline__ u32 __attribute__((unused)) cm_clear_mod_reg_bits(u32 bits,
-                                                       s16 module, s16 idx)
+static inline u32 cm_clear_mod_reg_bits(u32 bits, s16 module, s16 idx)
 {
        return cm_rmw_mod_reg_bits(bits, 0x0, module, idx);
 }

diff --git a/arch/arm/mach-omap2/prm.h b/arch/arm/mach-omap2/prm.h
index f255579..c55c2c0 100644 (file)
--- a/arch/arm/mach-omap2/prm.h
+++ b/arch/arm/mach-omap2/prm.h
@@ -208,12 +208,12 @@ extern void prm_write_mod_reg(u32 val, s16 module, u16 idx);
 extern u32 prm_rmw_mod_reg_bits(u32 mask, u32 bits, s16 module, s16 idx);
 
 /* Read-modify-write bits in a PRM register (by domain) */
-static u32 __attribute__((unused)) prm_set_mod_reg_bits(u32 bits, s16 module, s16 idx)
+static inline u32 prm_set_mod_reg_bits(u32 bits, s16 module, s16 idx)
 {
        return prm_rmw_mod_reg_bits(bits, bits, module, idx);
 }
 
-static u32 __attribute__((unused)) prm_clear_mod_reg_bits(u32 bits, s16 module, s16 idx)
+static inline u32 prm_clear_mod_reg_bits(u32 bits, s16 module, s16 idx)
 {
        return prm_rmw_mod_reg_bits(bits, 0x0, module, idx);
 }

diff --git a/arch/arm/mach-omap2/sdrc.h b/arch/arm/mach-omap2/sdrc.h
index eff3bd9..896b578 100644 (file)
--- a/arch/arm/mach-omap2/sdrc.h
+++ b/arch/arm/mach-omap2/sdrc.h
@@ -26,7 +26,7 @@ extern void __iomem *omap2_sms_base;
 
 /* SDRC global register get/set */
 
-static void __attribute__((unused)) 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));
@@ -34,14 +34,14 @@ static void __attribute__((unused)) sdrc_write_reg(u32 val, u16 reg)
        __raw_writel(val, OMAP_SDRC_REGADDR(reg));
 }
 
-static u32 __attribute__((unused)) 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 void __attribute__((unused)) 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));
@@ -49,7 +49,7 @@ static void __attribute__((unused)) sms_write_reg(u32 val, u16 reg)
        __raw_writel(val, OMAP_SMS_REGADDR(reg));
 }
 
-static u32 __attribute__((unused)) sms_read_reg(u16 reg)
+static u32 sms_read_reg(u16 reg)
 {
        return __raw_readl(OMAP_SMS_REGADDR(reg));
 }