Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68275680 authored by Roman Kiryanov's avatar Roman Kiryanov Committed by Greg Kroah-Hartman
Browse files

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: default avatarRoman Kiryanov <rkir@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 72755eed

include/linux/goldfish.h

+7 −4
Original line number Original line Diff line number Diff line
@@ -2,6 +2,7 @@ 
#ifndef __LINUX_GOLDFISH_H

#ifndef __LINUX_GOLDFISH_H

#define __LINUX_GOLDFISH_H

#define __LINUX_GOLDFISH_H





#include <linux/kernel.h>

#include <linux/types.h>

#include <linux/types.h>

#include <linux/io.h>

#include <linux/io.h>
@@ -10,9 +11,11 @@ 
static inline void gf_write_ptr(const void *ptr, void __iomem *portl,

static inline void gf_write_ptr(const void *ptr, void __iomem *portl,

				void __iomem *porth)

				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

#ifdef CONFIG_64BIT

	writel((unsigned long)ptr >> 32, porth);

	writel(upper_32_bits(addr), porth);

#endif

#endif

}

}
@@ -20,9 +23,9 @@ static inline void gf_write_dma_addr(const dma_addr_t addr, 
				     void __iomem *portl,

				     void __iomem *portl,

				     void __iomem *porth)

				     void __iomem *porth)

{

{

	writel((u32)addr, portl);

	writel(lower_32_bits(addr), portl);

#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT

#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT

	writel(addr >> 32, porth);

	writel(upper_32_bits(addr), porth);

#endif

#endif

}

}