* Felipe Balbi <felipe.balbi@xxxxxxxxx> [081010 12:24]: > On Fri, Oct 10, 2008 at 12:05:09PM +0300, Tereshonkov Roman wrote: > > A patch description would be great here > > > > > Signed-off-by: Roman Tereshonkov <roman.tereshonkov@xxxxxxxxx> > > Acked-by: Felipe Balbi <felipe.balbi@xxxxxxxxx> Pushing. Tony > > > --- > > drivers/misc/sti/sdti.c | 12 ++++++------ > > 1 files changed, 6 insertions(+), 6 deletions(-) > > > > diff --git a/drivers/misc/sti/sdti.c b/drivers/misc/sti/sdti.c > > index c35821d..2631ccf 100644 > > --- a/drivers/misc/sti/sdti.c > > +++ b/drivers/misc/sti/sdti.c > > @@ -32,7 +32,7 @@ > > #define CPU2_TRACE_EN 0x02 > > > > static struct clk *sdti_ck; > > -unsigned long sti_base, sti_channel_base; > > +void __iomem *sti_base, *sti_channel_base; > > static DEFINE_SPINLOCK(sdti_lock); > > > > void omap_sti_channel_write_trace(int len, int id, void *data, > > @@ -137,14 +137,14 @@ static int __devinit omap_sdti_probe(struct platform_device *pdev) > > } > > > > size = res->end - res->start; > > - sti_base = (unsigned long)ioremap(res->start, size); > > + sti_base = ioremap(res->start, size); > > if (unlikely(!sti_base)) > > return -ENODEV; > > > > size = cres->end - cres->start; > > - sti_channel_base = (unsigned long)ioremap(cres->start, size); > > + sti_channel_base = ioremap(cres->start, size); > > if (unlikely(!sti_channel_base)) { > > - iounmap((void *)sti_base); > > + iounmap(sti_base); > > return -ENODEV; > > } > > > > @@ -153,8 +153,8 @@ static int __devinit omap_sdti_probe(struct platform_device *pdev) > > > > static int __devexit omap_sdti_remove(struct platform_device *pdev) > > { > > - iounmap((void *)sti_channel_base); > > - iounmap((void *)sti_base); > > + iounmap(sti_channel_base); > > + iounmap(sti_base); > > omap_sdti_exit(); > > > > return 0; > > -- > > 1.5.5.1 > > > > -- > > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > > the body of a message to majordomo@xxxxxxxxxxxxxxx > > More majordomo info at http://vger.kernel.org/majordomo-info.html > > -- > balbi > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html