From d2fcafad7996cf0b851bf410349cbc6e25bf8bce Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Wed, 14 Sep 2011 17:06:22 -0400 Subject: [PATCH] --- yaml --- r: 279871 b: refs/heads/master c: 6949f8c08d232a4f4ed8f93eeff0815b2a6d39f4 h: refs/heads/master i: 279869: 0307aca10774e058f7acd80ce6b213dca5c02124 279867: e5a0d8b14c2f3fd2d261dd2ffdc012db416c0c2e 279863: 0984865575a145251e09e4c499307d8a6a80673d 279855: b798d6b75a4f77a174b3b6d3da76ca95f2088c8b 279839: bbc932a230ed3fd182a2fca72df2c6232bcc3b3d 279807: 4dbbc53f673237fbf4451f3ab7c9d72e4f7cb661 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-orion5x/include/mach/io.h | 25 ------------------- 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/[refs] b/[refs] index bfa960024d90..86804b512c57 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bfcd2ea6a40b33270564d706396f1b514a988d3c +refs/heads/master: 6949f8c08d232a4f4ed8f93eeff0815b2a6d39f4 diff --git a/trunk/arch/arm/mach-orion5x/include/mach/io.h b/trunk/arch/arm/mach-orion5x/include/mach/io.h index c5196101a237..e9d9afdc2659 100644 --- a/trunk/arch/arm/mach-orion5x/include/mach/io.h +++ b/trunk/arch/arm/mach-orion5x/include/mach/io.h @@ -15,31 +15,6 @@ #define IO_SPACE_LIMIT 0xffffffff -static inline void __iomem * -__arch_ioremap(unsigned long paddr, size_t size, unsigned int mtype) -{ - void __iomem *retval; - unsigned long offs = paddr - ORION5X_REGS_PHYS_BASE; - if (mtype == MT_DEVICE && size && offs < ORION5X_REGS_SIZE && - size <= ORION5X_REGS_SIZE && offs + size <= ORION5X_REGS_SIZE) { - retval = (void __iomem *)ORION5X_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 *)ORION5X_REGS_VIRT_BASE || - addr >= (void __iomem *)(ORION5X_REGS_VIRT_BASE + ORION5X_REGS_SIZE)) - __iounmap(addr); -} - -#define __arch_ioremap __arch_ioremap -#define __arch_iounmap __arch_iounmap #define __io(a) __typesafe_io(a) #define __mem_pci(a) (a)