From 59ba5ac7eaf94be86d8db1faa3781682e4d120a1 Mon Sep 17 00:00:00 2001
From: "Lad, Prabhakar" <prabhakar.lad@ti.com>
Date: Fri, 9 Nov 2012 05:59:32 -0300
Subject: [PATCH] --- yaml --- r: 343917 b: refs/heads/master c:
 baa29837a76d5738837602ff249a0c371591d7c7 h: refs/heads/master i:   343915:
 5f3585f7a10bbd9cd2c9f7da55a4964f0cc0103f v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/media/platform/davinci/vpbe_osd.c | 9 ++++-----
 trunk/include/media/davinci/vpbe_osd.h          | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index c37af8d99d54..eb990c4391b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c5dff905714446f8836b40a93bfeabd0aea8c82
+refs/heads/master: baa29837a76d5738837602ff249a0c371591d7c7
diff --git a/trunk/drivers/media/platform/davinci/vpbe_osd.c b/trunk/drivers/media/platform/davinci/vpbe_osd.c
index bba299dbf396..707f243f810d 100644
--- a/trunk/drivers/media/platform/davinci/vpbe_osd.c
+++ b/trunk/drivers/media/platform/davinci/vpbe_osd.c
@@ -62,7 +62,7 @@ static inline u32 osd_set(struct osd_state *sd, u32 mask, u32 offset)
 {
 	struct osd_state *osd = sd;
 
-	u32 addr = osd->osd_base + offset;
+	void __iomem *addr = osd->osd_base + offset;
 	u32 val = readl(addr) | mask;
 
 	writel(val, addr);
@@ -74,7 +74,7 @@ static inline u32 osd_clear(struct osd_state *sd, u32 mask, u32 offset)
 {
 	struct osd_state *osd = sd;
 
-	u32 addr = osd->osd_base + offset;
+	void __iomem *addr = osd->osd_base + offset;
 	u32 val = readl(addr) & ~mask;
 
 	writel(val, addr);
@@ -87,7 +87,7 @@ static inline u32 osd_modify(struct osd_state *sd, u32 mask, u32 val,
 {
 	struct osd_state *osd = sd;
 
-	u32 addr = osd->osd_base + offset;
+	void __iomem *addr = osd->osd_base + offset;
 	u32 new_val = (readl(addr) & ~mask) | (val & mask);
 
 	writel(new_val, addr);
@@ -1559,8 +1559,7 @@ static int osd_probe(struct platform_device *pdev)
 		ret = -ENODEV;
 		goto free_mem;
 	}
-	osd->osd_base = (unsigned long)ioremap_nocache(res->start,
-							osd->osd_size);
+	osd->osd_base = ioremap_nocache(res->start, osd->osd_size);
 	if (!osd->osd_base) {
 		dev_err(osd->dev, "Unable to map the OSD region\n");
 		ret = -ENODEV;
diff --git a/trunk/include/media/davinci/vpbe_osd.h b/trunk/include/media/davinci/vpbe_osd.h
index d7e397a444e6..5ab0d8d41f68 100644
--- a/trunk/include/media/davinci/vpbe_osd.h
+++ b/trunk/include/media/davinci/vpbe_osd.h
@@ -357,7 +357,7 @@ struct osd_state {
 	spinlock_t lock;
 	struct device *dev;
 	dma_addr_t osd_base_phys;
-	unsigned long osd_base;
+	void __iomem *osd_base;
 	unsigned long osd_size;
 	/* 1-->the isr will toggle the VID0 ping-pong buffer */
 	int pingpong;