[media] media: davinci: vpbe: fix build warning

Warnings were generated because of the following commit changed data type for
address pointer
195bbca ARM: 7500/1: io: avoid writeback addressing modes for __raw_ accessors
add  __iomem annotation to fix following warnings
drivers/media/platform/davinci/vpbe_osd.c: In function ‘osd_read’:
drivers/media/platform/davinci/vpbe_osd.c:49:2: warning: passing
 argument 1 of ‘__raw_readl’ makes pointer from integer without a cast [enabled by default]
arch/arm/include/asm/io.h:104:19: note: expected ‘const volatile
 void *’ but argument is of type ‘long unsigned int’
This patch stores the ioremap_nocache() returned address in a
void __iomem * instead of a unsigned long and passes the same to
readl/writel functions which fixes the above warnings.

Signed-off-by: Lad, Prabhakar <prabhakar.lad@ti.com>
Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/platform/davinci/vpbe_osd.c b/drivers/media/platform/davinci/vpbe_osd.c
index bba299dbf3967c6e7e708f9631eb9853912d1833..707f243f810d806fcc5efc04a13b66bd2a47ca63 100644 (file)
--- a/drivers/media/platform/davinci/vpbe_osd.c
+++ b/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/include/media/davinci/vpbe_osd.h b/include/media/davinci/vpbe_osd.h
index d7e397a444e68baa9a240646d927f692719b251c..5ab0d8d41f6827b6cd582e669e536de3b106ee69 100644 (file)
--- a/include/media/davinci/vpbe_osd.h
+++ b/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;