summaryrefslogtreecommitdiffstats
path: root/include/linux/goldfish.h
diff options
context:
space:
mode:
authorPeter Senna Tschudin <peter.senna@gmail.com>2015-05-19 11:44:46 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-05-31 11:40:14 +0900
commit07d783fd830a49008f3b2764ae7b6033ee1bf329 (patch)
tree77d2042ff6626aa29cb047791a7d20f1ec23863c /include/linux/goldfish.h
parente97bc8b220c41cab2e84d7410ece70166bba9fe9 (diff)
downloadlinux-stable-07d783fd830a49008f3b2764ae7b6033ee1bf329.tar.gz
linux-stable-07d783fd830a49008f3b2764ae7b6033ee1bf329.tar.bz2
linux-stable-07d783fd830a49008f3b2764ae7b6033ee1bf329.zip
staging: goldfish: Fix pointer cast for 32 bits
As the first argument of gf_write64() was of type unsigned long, and as some calls to gf_write64() were casting the first argument from void * to u64 the compiler and/or sparse were printing warnings for casts of wrong sizes when compiling for i386. This patch changes the type of the first argument of gf_write64() to const void *, and update calls to the function. This change fixed the warnings and allowed to remove casts from 3 calls to gf_write64(). In addition gf_write64() was renamed to gf_write_ptr() as the name was misleading because it only writes 32 bits on 32 bit systems. gf_write_dma_addr() was added to handle dma_addr_t values which is used at drivers/staging/goldfish/goldfish_audio.c. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/goldfish.h')
-rw-r--r--include/linux/goldfish.h19
1 files changed, 15 insertions, 4 deletions
diff --git a/include/linux/goldfish.h b/include/linux/goldfish.h
index 569236e6b2bc..93e080b39cf6 100644
--- a/include/linux/goldfish.h
+++ b/include/linux/goldfish.h
@@ -3,13 +3,24 @@
/* Helpers for Goldfish virtual platform */
-static inline void gf_write64(unsigned long data,
- void __iomem *portl, void __iomem *porth)
+static inline void gf_write_ptr(const void *ptr, void __iomem *portl,
+ void __iomem *porth)
{
- writel((u32)data, portl);
+ writel((u32)(unsigned long)ptr, portl);
#ifdef CONFIG_64BIT
- writel(data>>32, porth);
+ writel((unsigned long)ptr >> 32, porth);
#endif
}
+static inline void gf_write_dma_addr(const dma_addr_t addr,
+ void __iomem *portl,
+ void __iomem *porth)
+{
+ writel((u32)addr, portl);
+#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT
+ writel(addr >> 32, porth);
+#endif
+}
+
+
#endif /* __LINUX_GOLDFISH_H */