X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fmisc%2Fsti%2Fsdti.c;h=4514783dd45035f30230553a22aa0670e1846481;hb=ec9c52d6eb9bc30341209d7d4fc2377be8e98e0e;hp=c35821d5b4dd75780b8b75bff155f2216fed1642;hpb=e641d796b5ca790f53ddcb885bdbaed1642e4544;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/misc/sti/sdti.c b/drivers/misc/sti/sdti.c
index c35821d5b4d..4514783dd45 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;