Skip to content

Commit

Permalink
goldfish: Use dedicated macros instead of manual bit shifting
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Roman Kiryanov authored and Greg Kroah-Hartman committed Aug 2, 2018
1 parent 72755ee commit 6827568
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions include/linux/goldfish.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#ifndef __LINUX_GOLDFISH_H
#define __LINUX_GOLDFISH_H

#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/io.h>

Expand All @@ -10,19 +11,21 @@
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
}

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
}

Expand Down

0 comments on commit 6827568

Please sign in to comment.