diff options
| author | Christoph Hellwig <hch@lst.de> | 2019-08-12 23:39:23 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2019-11-11 17:19:50 +0100 |
| commit | ab53cea4186162cdc5e1f038dd656d4c983a2647 (patch) | |
| tree | 08c1663696cdee5d35817e780f9b8f79fbb6edb8 /arch/xtensa/include | |
| parent | c0d94aa54bd893bd41ca35e2a2de332742bb167d (diff) | |
| download | linux-stable-ab53cea4186162cdc5e1f038dd656d4c983a2647.tar.gz linux-stable-ab53cea4186162cdc5e1f038dd656d4c983a2647.tar.bz2 linux-stable-ab53cea4186162cdc5e1f038dd656d4c983a2647.zip | |
xtensa: clean up ioremap
Use ioremap as the main implemented function, and defined
ioremap_nocache to it as a deprecated alias.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'arch/xtensa/include')
| -rw-r--r-- | arch/xtensa/include/asm/io.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/arch/xtensa/include/asm/io.h b/arch/xtensa/include/asm/io.h index 988e08530a5c..441fb56926a7 100644 --- a/arch/xtensa/include/asm/io.h +++ b/arch/xtensa/include/asm/io.h @@ -32,8 +32,7 @@ void xtensa_iounmap(volatile void __iomem *addr); /* * Return the virtual address for the specified bus memory. */ -static inline void __iomem *ioremap_nocache(unsigned long offset, - unsigned long size) +static inline void __iomem *ioremap(unsigned long offset, unsigned long size) { if (offset >= XCHAL_KIO_PADDR && offset - XCHAL_KIO_PADDR < XCHAL_KIO_SIZE) @@ -52,15 +51,10 @@ static inline void __iomem *ioremap_cache(unsigned long offset, return xtensa_ioremap_cache(offset, size); } #define ioremap_cache ioremap_cache -#define ioremap_nocache ioremap_nocache - -#define ioremap_wc ioremap_nocache -#define ioremap_wt ioremap_nocache -static inline void __iomem *ioremap(unsigned long offset, unsigned long size) -{ - return ioremap_nocache(offset, size); -} +#define ioremap_nocache ioremap +#define ioremap_wc ioremap +#define ioremap_wt ioremap static inline void iounmap(volatile void __iomem *addr) { |