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/m68k | |
| parent | 280ac17856ec438757810c9123ddf2294b07c46f (diff) | |
| parent | 3cd944590da9b9840c9f14bfc6581bec308c7c71 (diff) | |
| download | linux-stable-d67a308ac5de5b24b678ee90759a3b2e4283c11e.tar.gz linux-stable-d67a308ac5de5b24b678ee90759a3b2e4283c11e.tar.bz2 linux-stable-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/m68k')
| -rw-r--r-- | arch/m68k/include/asm/io_mm.h | 6 | ||||
| -rw-r--r-- | arch/m68k/include/asm/kmap.h | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/arch/m68k/include/asm/io_mm.h b/arch/m68k/include/asm/io_mm.h index 47525f2a57e1..090aec54b8fa 100644 --- a/arch/m68k/include/asm/io_mm.h +++ b/arch/m68k/include/asm/io_mm.h @@ -389,12 +389,6 @@ static inline void isa_delay(void) #define __ARCH_HAS_NO_PAGE_ZERO_MAPPED 1 -/* - * Convert a physical pointer to a virtual kernel pointer for /dev/mem - * access - */ -#define xlate_dev_mem_ptr(p) __va(p) - #define readb_relaxed(addr) readb(addr) #define readw_relaxed(addr) readw(addr) #define readl_relaxed(addr) readl(addr) diff --git a/arch/m68k/include/asm/kmap.h b/arch/m68k/include/asm/kmap.h index 4efb3efa593a..b778f015c917 100644 --- a/arch/m68k/include/asm/kmap.h +++ b/arch/m68k/include/asm/kmap.h @@ -25,7 +25,6 @@ static inline void __iomem *ioremap(unsigned long physaddr, unsigned long size) return __ioremap(physaddr, size, IOMAP_NOCACHE_SER); } -#define ioremap_uc ioremap #define ioremap_wt ioremap_wt static inline void __iomem *ioremap_wt(unsigned long physaddr, unsigned long size) |