diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-11-23 12:39:13 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-11-23 12:39:13 +0300 |
| commit | d67a308ac5de5b24b678ee90759a3b2e4283c11e (patch) | |
| tree | 91163d9ead55a9d1b562f67500e5d24bba99c2b4 /arch/arm/include | |
| parent | 280ac17856ec438757810c9123ddf2294b07c46f (diff) | |
| parent | 3cd944590da9b9840c9f14bfc6581bec308c7c71 (diff) | |
| download | linux-d67a308ac5de5b24b678ee90759a3b2e4283c11e.tar.xz | |
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/arm/include')
| -rw-r--r-- | arch/arm/include/asm/io.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h index 56b08ed6cc3b..1815748f5d2a 100644 --- a/arch/arm/include/asm/io.h +++ b/arch/arm/include/asm/io.h @@ -407,12 +407,6 @@ struct pci_dev; #define pci_iounmap pci_iounmap extern void pci_iounmap(struct pci_dev *dev, void __iomem *addr); -/* - * Convert a physical pointer to a virtual kernel pointer for /dev/mem - * access - */ -#define xlate_dev_mem_ptr(p) __va(p) - #include <asm-generic/io.h> #ifdef CONFIG_MMU |