summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorRoman Kiryanov <rkir@google.com>2018-03-30 14:55:02 -0700
committerGreg Kroah-Hartman <gregkh@google.com>2018-04-04 15:03:59 +0000
commitdac472216c722e57af90306535dc8100d4bc91ef (patch)
tree90dbe6dff2889bfda30aed248acc6509aec79aca /include/linux
parent014fa364f80b4607b1f6d88eda43fad07fadf3e6 (diff)
ANDROID: Cleanup type casting in goldfish.h
Bug: 72886167 Change-Id: I506a24e6e659d83a9df5efa0f8f00229e0a4b2d4 Signed-off-by: Roman Kiryanov <rkir@google.com>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/goldfish.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/goldfish.h b/include/linux/goldfish.h
index e7e6f7aff124..793590dcfb47 100644
--- a/include/linux/goldfish.h
+++ b/include/linux/goldfish.h
@@ -9,9 +9,11 @@
static inline void gf_write_ptr(const void *ptr, void __iomem *portl,
void __iomem *porth)
{
- writel((u32)(unsigned long)ptr, portl);
+ const uintptr_t addr = (uintptr_t)ptr;
+
+ writel((u32)addr, portl);
#ifdef CONFIG_64BIT
- writel((unsigned long)ptr >> 32, porth);
+ writel(addr >> 32, porth);
#endif
}