aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc/include/asm/io_32.h
diff options
context:
space:
mode:
authorGreentime Hu <greentime@andestech.com>2017-11-22 18:57:46 +0800
committerGreentime Hu <greentime@andestech.com>2018-02-22 10:44:30 +0800
commitb3ada9d0ce8d286c8bbbb02fdbddec5036242b42 (patch)
treef459bc321749a4a902343c7bbdb4b8854059779e /arch/sparc/include/asm/io_32.h
parentxtensa: add ioremap_nocache declaration before include asm-generic/io.h. (diff)
downloadlinux-dev-b3ada9d0ce8d286c8bbbb02fdbddec5036242b42.tar.xz
linux-dev-b3ada9d0ce8d286c8bbbb02fdbddec5036242b42.zip
asm-generic/io.h: move ioremap_nocache/ioremap_uc/ioremap_wc/ioremap_wt out of ifndef CONFIG_MMU
It allows some architectures to use this generic macro instead of defining theirs. sparc: io: To use the define of ioremap_[nocache|wc|wb] in asm-generic/io.h It will move the ioremap_nocache out of the CONFIG_MMU ifdef. This means that in order to suppress re-definition errors we need to remove the #define in arch/sparc/include/asm/io_32.h. Also, the change adds a prototype for ioremap where size is size_t and offset is phys_addr_t so fix that as well. Signed-off-by: Greentime Hu <greentime@andestech.com>
Diffstat (limited to 'arch/sparc/include/asm/io_32.h')
-rw-r--r--arch/sparc/include/asm/io_32.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/sparc/include/asm/io_32.h b/arch/sparc/include/asm/io_32.h
index cd51a89b393c..df2dc1784673 100644
--- a/arch/sparc/include/asm/io_32.h
+++ b/arch/sparc/include/asm/io_32.h
@@ -127,12 +127,7 @@ static inline void sbus_memcpy_toio(volatile void __iomem *dst,
* Bus number may be embedded in the higher bits of the physical address.
* This is why we have no bus number argument to ioremap().
*/
-void __iomem *ioremap(unsigned long offset, unsigned long size);
-#define ioremap_nocache(X,Y) ioremap((X),(Y))
-#define ioremap_wc(X,Y) ioremap((X),(Y))
-#define ioremap_wt(X,Y) ioremap((X),(Y))
void iounmap(volatile void __iomem *addr);
-
/* Create a virtual mapping cookie for an IO port range */
void __iomem *ioport_map(unsigned long port, unsigned int nr);
void ioport_unmap(void __iomem *);