[PATCH v3] Fix pointer cast for 32 bits arch

Peter Senna Tschudin
2015-04-12T11:39:00Z

Sparse complains about casting void * to u64 on i386.
Change the cast to resource_size_t.

Also update the type of the first argument of gf_write64()
from unsigned long to resource_size_t.

Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
---
Changes from V2:
- Fixed spelling of complains
- Updated commit message

Changes from V1:
- Updated commit message

Tested by compilation only. Compiled for x86 and x86_64.

drivers/staging/goldfish/goldfish_nand.c | 3 ++-
include/linux/goldfish.h | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/goldfish/goldfish_nand.c b/drivers/staging/goldfish/goldfish_nand.c
index d68f216..738fdc4 100644
--- a/drivers/staging/goldfish/goldfish_nand.c
+++ b/drivers/staging/goldfish/goldfish_nand.c
@@ -87,7 +87,8 @@ static u32 goldfish_nand_cmd(struct mtd_info *mtd, enum nand_cmd cmd,
writel((u32)(addr >> 32), base + NAND_ADDR_HIGH);
writel((u32)addr, base + NAND_ADDR_LOW);
writel(len, base + NAND_TRANSFER_SIZE);
- gf_write64((u64)ptr, base + NAND_DATA, base + NAND_DATA_HIGH);
+ gf_write64((resource_size_t)ptr, base + NAND_DATA,
+ base + NAND_DATA_HIGH);
writel(cmd, base + NAND_COMMAND);
rv = readl(base + NAND_RESULT);
}
diff --git a/include/linux/goldfish.h b/include/linux/goldfish.h
index 569236e..494e943 100644
--- a/include/linux/goldfish.h
+++ b/include/linux/goldfish.h
@@ -3,7 +3,7 @@

/* Helpers for Goldfish virtual platform */

-static inline void gf_write64(unsigned long data,
+static inline void gf_write64(resource_size_t data,
void __iomem *portl, void __iomem *porth)
{
writel((u32)data, portl);
--
2.1.0