goldfish: Use dedicated macros instead of manual bit shifting

There are dedicated macros (lower_32_bits and upper_32_bits)
available to extract the lower and upper 32 bits. They provide
better readability and could prevent some compilation warnings.

Signed-off-by: Roman Kiryanov <rkir@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Roman Kiryanov 2018-07-23 15:47:27 -07:00 committed by Greg Kroah-Hartman
parent 72755eed6c
commit 68275680ea

View File

@ -2,6 +2,7 @@
#ifndef __LINUX_GOLDFISH_H
#define __LINUX_GOLDFISH_H
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/io.h>
@ -10,9 +11,11 @@
static inline void gf_write_ptr(const void *ptr, void __iomem *portl,
void __iomem *porth)
{
writel((u32)(unsigned long)ptr, portl);
const unsigned long addr = (unsigned long)ptr;
writel(lower_32_bits(addr), portl);
#ifdef CONFIG_64BIT
writel((unsigned long)ptr >> 32, porth);
writel(upper_32_bits(addr), porth);
#endif
}
@ -20,9 +23,9 @@ static inline void gf_write_dma_addr(const dma_addr_t addr,
void __iomem *portl,
void __iomem *porth)
{
writel((u32)addr, portl);
writel(lower_32_bits(addr), portl);
#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT
writel(addr >> 32, porth);
writel(upper_32_bits(addr), porth);
#endif
}