summaryrefslogtreecommitdiffstats
path: root/arch/hexagon
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2023-11-23 10:39:13 +0100
committerArnd Bergmann <arnd@arndb.de>2023-11-23 10:39:13 +0100
commitd67a308ac5de5b24b678ee90759a3b2e4283c11e (patch)
tree91163d9ead55a9d1b562f67500e5d24bba99c2b4 /arch/hexagon
parenthexagon: Remove CONFIG_HEXAGON_ARCH_VERSION from uapi header (diff)
parentasm/io: remove unnecessary xlate_dev_mem_ptr() and unxlate_dev_mem_ptr() (diff)
downloadlinux-d67a308ac5de5b24b678ee90759a3b2e4283c11e.tar.xz
linux-d67a308ac5de5b24b678ee90759a3b2e4283c11e.zip
Merge branch 'asm-generic-io.h-cleanup' into asm-generic
MIPS is the last architecture that is yet to start using asm-generic/io.h, so Baoquan He converts it, which allows the other changes to remove code duplication, and it will allow further cleanups in the future. * asm-generic-io.h-cleanup: asm/io: remove unnecessary xlate_dev_mem_ptr() and unxlate_dev_mem_ptr() mips: io: remove duplicated codes arch/*/io.h: remove ioremap_uc in some architectures mips: add <asm-generic/io.h> including
Diffstat (limited to 'arch/hexagon')
-rw-r--r--arch/hexagon/include/asm/io.h9
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/hexagon/include/asm/io.h b/arch/hexagon/include/asm/io.h
index e2b308e32a37..522d321ea85a 100644
--- a/arch/hexagon/include/asm/io.h
+++ b/arch/hexagon/include/asm/io.h
@@ -59,12 +59,6 @@ static inline void *phys_to_virt(unsigned long address)
}
/*
- * convert a physical pointer to a virtual kernel pointer for
- * /dev/mem access.
- */
-#define xlate_dev_mem_ptr(p) __va(p)
-
-/*
* IO port access primitives. Hexagon doesn't have special IO access
* instructions; all I/O is memory mapped.
*
@@ -174,9 +168,6 @@ static inline void writel(u32 data, volatile void __iomem *addr)
#define _PAGE_IOREMAP (_PAGE_PRESENT | _PAGE_READ | _PAGE_WRITE | \
(__HEXAGON_C_DEV << 6))
-#define ioremap_uc(addr, size) ioremap((addr), (size))
-
-
#define __raw_writel writel
static inline void memcpy_fromio(void *dst, const volatile void __iomem *src,