linux-kernel - [PATCH] media: davinci: vpbe: fix build warning

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Sat, 20 Oct 2012 12:32:20 +0530
From:	Prabhakar Lad <prabhakar.csengg@...il.com>
To:	LMML <linux-media@...r.kernel.org>
Cc:	Manjunath Hadli <manjunath.hadli@...com>,
	Mauro Carvalho Chehab <mchehab@...radead.org>,
	LKML <linux-kernel@...r.kernel.org>,
	DLOS <davinci-linux-open-source@...ux-davincidsp.com>,
	"Lad, Prabhakar" <prabhakar.lad@...com>
Subject: [PATCH] media: davinci: vpbe: fix build warning

From: Lad, Prabhakar <prabhakar.lad@...com>

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’

Signed-off-by: Lad, Prabhakar <prabhakar.lad@...com>
Signed-off-by: Manjunath Hadli <manjunath.hadli@...com>
---
 drivers/media/platform/davinci/vpbe_osd.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/media/platform/davinci/vpbe_osd.c b/drivers/media/platform/davinci/vpbe_osd.c
index bba299d..9ab9280 100644
--- a/drivers/media/platform/davinci/vpbe_osd.c
+++ b/drivers/media/platform/davinci/vpbe_osd.c
@@ -46,14 +46,14 @@ static inline u32 osd_read(struct osd_state *sd, u32 offset)
 {
 	struct osd_state *osd = sd;
 
-	return readl(osd->osd_base + offset);
+	return readl(IOMEM(osd->osd_base + offset));
 }
 
 static inline u32 osd_write(struct osd_state *sd, u32 val, u32 offset)
 {
 	struct osd_state *osd = sd;
 
-	writel(val, osd->osd_base + offset);
+	writel(val, IOMEM(osd->osd_base + offset));
 
 	return val;
 }
@@ -63,9 +63,9 @@ static inline u32 osd_set(struct osd_state *sd, u32 mask, u32 offset)
 	struct osd_state *osd = sd;
 
 	u32 addr = osd->osd_base + offset;
-	u32 val = readl(addr) | mask;
+	u32 val = readl(IOMEM(addr)) | mask;
 
-	writel(val, addr);
+	writel(val, IOMEM(addr));
 
 	return val;
 }
@@ -75,9 +75,9 @@ static inline u32 osd_clear(struct osd_state *sd, u32 mask, u32 offset)
 	struct osd_state *osd = sd;
 
 	u32 addr = osd->osd_base + offset;
-	u32 val = readl(addr) & ~mask;
+	u32 val = readl(IOMEM(addr)) & ~mask;
 
-	writel(val, addr);
+	writel(val, IOMEM(addr));
 
 	return val;
 }
@@ -88,9 +88,9 @@ static inline u32 osd_modify(struct osd_state *sd, u32 mask, u32 val,
 	struct osd_state *osd = sd;
 
 	u32 addr = osd->osd_base + offset;
-	u32 new_val = (readl(addr) & ~mask) | (val & mask);
+	u32 new_val = (readl(IOMEM(addr)) & ~mask) | (val & mask);
 
-	writel(new_val, addr);
+	writel(new_val, IOMEM(addr));
 
 	return new_val;
 }
-- 
1.7.4.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/