diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-11-23 10:39:13 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-11-23 10:39:13 +0100 |
| commit | d67a308ac5de5b24b678ee90759a3b2e4283c11e (patch) | |
| tree | 91163d9ead55a9d1b562f67500e5d24bba99c2b4 /arch/sh | |
| parent | hexagon: Remove CONFIG_HEXAGON_ARCH_VERSION from uapi header (diff) | |
| parent | asm/io: remove unnecessary xlate_dev_mem_ptr() and unxlate_dev_mem_ptr() (diff) | |
| download | linux-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/sh')
| -rw-r--r-- | arch/sh/include/asm/io.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h index ac521f287fa5..cf5eab840d57 100644 --- a/arch/sh/include/asm/io.h +++ b/arch/sh/include/asm/io.h @@ -302,15 +302,6 @@ unsigned long long poke_real_address_q(unsigned long long addr, ioremap_prot((addr), (size), pgprot_val(PAGE_KERNEL)) #endif /* CONFIG_MMU */ -#define ioremap_uc ioremap - -/* - * Convert a physical pointer to a virtual kernel pointer for /dev/mem - * access - */ -#define xlate_dev_mem_ptr(p) __va(p) -#define unxlate_dev_mem_ptr(p, v) do { } while (0) - #include <asm-generic/io.h> #define ARCH_HAS_VALID_PHYS_ADDR_RANGE |