* Russell King - ARM Linux <linux@arm.linux.org.uk> [080819 10:21]:
> On Fri, Jun 06, 2008 at 07:12:30PM -0700, Tony Lindgren wrote:
> >  static void omap2_clk_wait_ready(struct clk *clk)
> >  {
> > -	void __iomem *reg, *other_reg, *st_reg;
> > -	u32 bit;
> > -
> > -	/*
> > -	 * REVISIT: This code is pretty ugly.  It would be nice to generalize
> > -	 * it and pull it into struct clk itself somehow.
> > -	 */
> > -	reg = clk->enable_reg;
> > -	if ((((u32)reg & 0xff) >= CM_FCLKEN1) &&
> > -	    (((u32)reg & 0xff) <= OMAP24XX_CM_FCLKEN2))
> > -		other_reg = (void __iomem *)(((u32)reg & ~0xf0) | 0x10); /* CM_ICLKEN* */
> > -	else if ((((u32)reg & 0xff) >= CM_ICLKEN1) &&
> > -		 (((u32)reg & 0xff) <= OMAP24XX_CM_ICLKEN4))
> > -		other_reg = (void __iomem *)(((u32)reg & ~0xf0) | 0x00); /* CM_FCLKEN* */
> > +	u32 bit, reg, other_reg, st_reg;
> > +
> > +	reg = (__force u32)clk->enable_reg;
> > +	if (((reg & 0xff) >= CM_FCLKEN1) &&
> > +	    ((reg & 0xff) <= OMAP24XX_CM_FCLKEN2))
> > +		other_reg = ((reg & ~0xf0) | 0x10); /* CM_ICLKEN* */
> > +	else if (((reg & 0xff) >= CM_ICLKEN1) &&
> > +		 ((reg & 0xff) <= OMAP24XX_CM_ICLKEN4))
> > +		other_reg = ((reg & ~0xf0) | 0x00); /* CM_FCLKEN* */
> 
> 	unsigned long reg = (unsigned long)clk->enable_reg;
> 
> IIRC is a permitted cast, doesn't require __force.  And you can convert
> back to void __iomem * without using __force either.
> 
> > diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
> > index aad781d..598f2d2 100644
> > --- a/arch/arm/mach-omap2/pm.c
> > +++ b/arch/arm/mach-omap2/pm.c
> > @@ -24,9 +24,9 @@
> >  #include <linux/module.h>
> >  #include <linux/delay.h>
> >  #include <linux/clk.h>
> > +#include <linux/io.h>
> > +#include <linux/irq.h>
> >  
> > -#include <asm/io.h>
> > -#include <asm/irq.h>
> 
> As I keep saying to people, not every warning that checkpatch spits
> out is valid.  asm/irq.h -> linux/irq.h is not a valid warning.

Here's this one updated.

Tony