diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-09-14 17:06:22 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nico@fluxnic.net> | 2011-11-18 13:51:16 -0500 |
| commit | a8ceac5ef7a98a1c36030e1ebd3f32f105fde288 (patch) | |
| tree | 98cab2b5a3af6b432f8d5ab9c31900081e0adaf6 | |
| parent | 6949f8c08d232a4f4ed8f93eeff0815b2a6d39f4 (diff) | |
| download | op-kernel-dev-a8ceac5ef7a98a1c36030e1ebd3f32f105fde288.zip op-kernel-dev-a8ceac5ef7a98a1c36030e1ebd3f32f105fde288.tar.gz | |
ARM: mach-kirkwood: remove arch specific special handling for ioremap
A generic version should replace this later.
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| -rw-r--r-- | arch/arm/mach-kirkwood/include/mach/io.h | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/arch/arm/mach-kirkwood/include/mach/io.h b/arch/arm/mach-kirkwood/include/mach/io.h index 1aaddc3..49dd0cb 100644 --- a/arch/arm/mach-kirkwood/include/mach/io.h +++ b/arch/arm/mach-kirkwood/include/mach/io.h @@ -19,31 +19,6 @@ static inline void __iomem *__io(unsigned long addr) + KIRKWOOD_PCIE_IO_VIRT_BASE); } -static inline void __iomem * -__arch_ioremap(unsigned long paddr, size_t size, unsigned int mtype) -{ - void __iomem *retval; - unsigned long offs = paddr - KIRKWOOD_REGS_PHYS_BASE; - if (mtype == MT_DEVICE && size && offs < KIRKWOOD_REGS_SIZE && - size <= KIRKWOOD_REGS_SIZE && offs + size <= KIRKWOOD_REGS_SIZE) { - retval = (void __iomem *)KIRKWOOD_REGS_VIRT_BASE + offs; - } else { - retval = __arm_ioremap(paddr, size, mtype); - } - - return retval; -} - -static inline void -__arch_iounmap(void __iomem *addr) -{ - if (addr < (void __iomem *)KIRKWOOD_REGS_VIRT_BASE || - addr >= (void __iomem *)(KIRKWOOD_REGS_VIRT_BASE + KIRKWOOD_REGS_SIZE)) - __iounmap(addr); -} - -#define __arch_ioremap __arch_ioremap -#define __arch_iounmap __arch_iounmap #define __io(a) __io(a) #define __mem_pci(a) (a) |
