]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
ARM: fix bug in macro __arch_ioremap.
authorTerry Lv <r65388@freescale.com>
Thu, 6 May 2010 10:30:55 +0000 (18:30 +0800)
committerWolfgang Denk <wd@denx.de>
Tue, 22 Jun 2010 20:33:06 +0000 (22:33 +0200)
Signed-off-by: Terry Lv <r65388@freescale.com>
Fix commit message and code formatting.

Signed-off-by: Wolfgang Denk <wd@denx.de>
arch/arm/include/asm/io.h

index 0a4b5be715720ce64af8f72f3e4a8ff3af3a2806..e8f3eb13aa4c9550140c440c756a42e7e7f2f081 100644 (file)
@@ -248,13 +248,13 @@ extern void __iounmap(void *addr);
  *  iomem_to_phys(off)
  */
 #ifdef iomem_valid_addr
-#define __arch_ioremap(off,sz,nocache)                         \
- ({                                                            \
-       unsigned long _off = (off), _size = (sz);               \
-       void *_ret = (void *)0;                                 \
-       if (iomem_valid_addr(_off, _size))                      \
-               _ret = __ioremap(iomem_to_phys(_off),_size,0);  \
-       _ret;                                                   \
+#define __arch_ioremap(off,sz,nocache)                                 \
+ ({                                                                    \
+       unsigned long _off = (off), _size = (sz);                       \
+       void *_ret = (void *)0;                                         \
+       if (iomem_valid_addr(_off, _size))                              \
+               _ret = __ioremap(iomem_to_phys(_off),_size,nocache);    \
+       _ret;                                                           \
  })
 
 #define __arch_iounmap __iounmap