ARM: OMAP3: Fix warnings in clock34xx.h

PATCH Superseded Dirk Behme 3 participants 3 messages Jun 23, 2008 – Jul 3, 2008

Subsystems (4)

Arm (32-bit) Arm sub-architectures OMAP2+ support OMAP clock framework support

lore

Share & tools

lore

Dirk Behme

author

2008-06-23 16:08 UTC #0 lore raw

PATCH v2 1/1 ARM: OMAP3: Fix warnings in clock34xx.h

Fix warnings

arch/arm/mach-omap2/clock34xx.h:178: warning: initialization makes pointer from integer without a cast arch/arm/mach-omap2/clock34xx.h:204: warning: initialization makes pointer from integer without a cast arch/arm/mach-omap2/clock34xx.h:229: warning: initialization makes pointer from integer without a cast arch/arm/mach-omap2/clock34xx.h:2238: warning: initialization makes pointer from integer without a cast

Signed-off-by Dirk Behme <[email protected]>

Subject: ARM: OMAP3: Fix warnings in clock34xx.h

From: Dirk Behme <[email protected]>

Fix warnings

Signed-off-by Dirk Behme <[email protected]>

---

Changes in V2: Incorporating comments from Paul Walmsley. Thanks!

arch/arm/mach-omap2/clock34xx.h +7 -4

Index: linux-beagle/arch/arm/mach-omap2/clock34xx.h
===================================================================
@@ -53,14 +53,17 @@ static int omap3_noncore_dpll_set_rate(s
 #define DPLL_LOW_POWER_BYPASS		0x5
 #define DPLL_LOCKED			0x7
 
+#define _OMAP34XX_PRM_REGADDR(module, reg)				\
+	((__force void __iomem *)(OMAP34XX_PRM_REGADDR((module), (reg))))
+
 #define OMAP3430_PRM_CLKSRC_CTRL					\
-	OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x0070)
+	_OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, OMAP3_PRM_CLKSRC_CTRL_OFFSET)
 
 #define OMAP3430_PRM_CLKSEL						\
-	OMAP34XX_PRM_REGADDR(OMAP3430_CCR_MOD, OMAP3_PRM_CLKSEL_OFFSET)
+	_OMAP34XX_PRM_REGADDR(OMAP3430_CCR_MOD, OMAP3_PRM_CLKSEL_OFFSET)
 
 #define OMAP3430_PRM_CLKOUT_CTRL					\
-	OMAP34XX_PRM_REGADDR(OMAP3430_CCR_MOD, OMAP3_PRM_CLKOUT_CTRL_OFFSET)
+	_OMAP34XX_PRM_REGADDR(OMAP3430_CCR_MOD, OMAP3_PRM_CLKOUT_CTRL_OFFSET)
 
 /* PRM CLOCKS */

@@ -2235,7 +2238,7 @@ static struct clk usbhost_sar_fck = {
 	.name		= "usbhost_sar_fck",
 	.parent		= &osc_sys_ck,
 	.init		= &omap2_init_clk_clkdm,
-	.enable_reg	= OMAP34XX_PRM_REGADDR(OMAP3430ES2_USBHOST_MOD, PM_PWSTCTRL),
+	.enable_reg	= _OMAP34XX_PRM_REGADDR(OMAP3430ES2_USBHOST_MOD, PM_PWSTCTRL),
 	.enable_bit	= OMAP3430ES2_SAVEANDRESTORE_SHIFT,
 	.flags		= CLOCK_IN_OMAP3430ES2,
 	.clkdm_name	= "usbhost_clkdm",

Paul Walmsley

maintainer Acked-by on v2 1/1

2008-06-23 19:08 UTC #1 lore raw

Quoted 11 lines · Dirk Behme

Fix warnings
arch/arm/mach-omap2/clock34xx.h:178: warning: initialization makes pointer from integer without a cast arch/arm/mach-omap2/clock34xx.h:204: warning: initialization makes pointer from integer without a cast arch/arm/mach-omap2/clock34xx.h:229: warning: initialization makes pointer from integer without a cast arch/arm/mach-omap2/clock34xx.h:2238: warning: initialization makes pointer from integer without a cast

Quoted 1 line

Signed-off-by Dirk Behme <[email protected]>

Thanks, Dirk.

Acked-by Paul Walmsley <[email protected]>

- Paul

Tony Lindgren

maintainer

2008-07-03 12:34 UTC #2 lore raw

Quoted 13 lines · Paul Walmsley

Quoted 11 lines · Dirk Behme
Fix warnings
arch/arm/mach-omap2/clock34xx.h:178: warning: initialization makes pointer from integer without a cast arch/arm/mach-omap2/clock34xx.h:204: warning: initialization makes pointer from integer without a cast arch/arm/mach-omap2/clock34xx.h:229: warning: initialization makes pointer from integer without a cast arch/arm/mach-omap2/clock34xx.h:2238: warning: initialization makes pointer from integer without a cast

Quoted 6 lines

Quoted 1 line
Signed-off-by Dirk Behme <[email protected]>
Thanks, Dirk.
Acked-by Paul Walmsley <[email protected]>

Hmm, I guess this depends on some other patch? I can't find usbhost_sar_fck in clock34xx.h?

Tony

Quoted 6 lines

- Paul
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html