[PATCH v2] ARM: OMAP3: Fix warnings in clock34xx.h

[PATCH v2] ARM: OMAP3: Fix warnings in clock34xx.h

[Dirk Behme]

[-- Attachment #1: Type: text/plain, Size: 483 bytes --]


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 <dirk.behme@gmail.com>


[-- Attachment #2: clock34xx_h_warning_fix.txt --]
[-- Type: text/plain, Size: 2068 bytes --]


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

From: Dirk Behme <dirk.behme@gmail.com>

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 <dirk.behme@gmail.com>

---

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

Index: linux-beagle/arch/arm/mach-omap2/clock34xx.h
===================================================================
--- linux-beagle.orig/arch/arm/mach-omap2/clock34xx.h
+++ 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",

Re: [PATCH v2] ARM: OMAP3: Fix warnings in clock34xx.h

[Paul Walmsley]

On Mon, 23 Jun 2008, Dirk Behme wrote:

> 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 <dirk.behme@gmail.com>

Thanks, Dirk.


Acked-by: Paul Walmsley <paul@pwsan.com>

- Paul

Re: [PATCH v2] ARM: OMAP3: Fix warnings in clock34xx.h

[Tony Lindgren]

* Paul Walmsley <paul@pwsan.com> [080623 22:10]:
> On Mon, 23 Jun 2008, Dirk Behme wrote:
> 
> > 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 <dirk.behme@gmail.com>
> 
> Thanks, Dirk.
> 
> 
> Acked-by: Paul Walmsley <paul@pwsan.com>

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

Tony


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