From e0ed4ea36176d2331bd13fcac8913550dbeaf145 Mon Sep 17 00:00:00 2001 From: Olof Johansson Date: Tue, 4 Oct 2011 03:44:07 +0100 Subject: [PATCH] --- yaml --- r: 264647 b: refs/heads/master c: b0c1264f534a1cb3c52036a23a04d238434a0df6 h: refs/heads/master i: 264645: c7bb10c407eecb38d63623ede8756fee823e433c 264643: c2995c570945ed8b3872af7a97b3012267d81221 264639: 6e1a25360946cbe627a52daf8aa3428afa319b35 v: v3 --- [refs] | 2 +- trunk/arch/arm/include/asm/io.h | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index bbf88c3e4363..27f692ef7c1a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ec5a95bbb8ba0b95506693a6bc0de72f1b5d969 +refs/heads/master: b0c1264f534a1cb3c52036a23a04d238434a0df6 diff --git a/trunk/arch/arm/include/asm/io.h b/trunk/arch/arm/include/asm/io.h index d66605dea55a..bbeb11eda814 100644 --- a/trunk/arch/arm/include/asm/io.h +++ b/trunk/arch/arm/include/asm/io.h @@ -189,11 +189,11 @@ extern void _memset_io(volatile void __iomem *, int, size_t); * IO port primitives for more information. */ #ifdef __mem_pci -#define readb_relaxed(c) ({ u8 __v = __raw_readb(__mem_pci(c)); __v; }) -#define readw_relaxed(c) ({ u16 __v = le16_to_cpu((__force __le16) \ - __raw_readw(__mem_pci(c))); __v; }) -#define readl_relaxed(c) ({ u32 __v = le32_to_cpu((__force __le32) \ - __raw_readl(__mem_pci(c))); __v; }) +#define readb_relaxed(c) ({ u8 __r = __raw_readb(__mem_pci(c)); __r; }) +#define readw_relaxed(c) ({ u16 __r = le16_to_cpu((__force __le16) \ + __raw_readw(__mem_pci(c))); __r; }) +#define readl_relaxed(c) ({ u32 __r = le32_to_cpu((__force __le32) \ + __raw_readl(__mem_pci(c))); __r; }) #define writeb_relaxed(v,c) ((void)__raw_writeb(v,__mem_pci(c))) #define writew_relaxed(v,c) ((void)__raw_writew((__force u16) \