[PATCH v2 18/18] asm-generic: io: define relaxed accessor macros unconditionally
Now that no architectures using asm-generic/io.h define their own relaxed
accessors, the dummy definitions can be used unconditionally.
Cc: Arnd Bergmann
Signed-off-by: Will Deacon
---
include/asm-generic/io.h | 16
1 file changed, 16 deletions(-)
diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
index 9ccedeb06522..f5611abb82ed 100644
--- a/include/asm-generic/io.h
+++ b/include/asm-generic/io.h
@@ -53,27 +53,21 @@ static inline u32 __raw_readl(const volatile void __iomem
*addr)
#endif
#define readb __raw_readb
-#ifndef readb_relaxed
#define readb_relaxed readb
-#endif
#define readw readw
static inline u16 readw(const volatile void __iomem *addr)
{
return __le16_to_cpu(__raw_readw(addr));
}
-#ifndef readw_relaxed
#define readw_relaxed readw
-#endif
#define readl readl
static inline u32 readl(const volatile void __iomem *addr)
{
return __le32_to_cpu(__raw_readl(addr));
}
-#ifndef readl_relaxed
#define readl_relaxed readl
-#endif
#ifndef __raw_writeb
static inline void __raw_writeb(u8 b, volatile void __iomem *addr)
@@ -97,19 +91,13 @@ static inline void __raw_writel(u32 b, volatile void
__iomem *addr)
#endif
#define writeb __raw_writeb
-#ifndef writeb_relaxed
#define writeb_relaxed writeb
-#endif
#define writew(b,addr) __raw_writew(__cpu_to_le16(b),addr)
-#ifndef writew_relaxed
#define writew_relaxed writew
-#endif
#define writel(b,addr) __raw_writel(__cpu_to_le32(b),addr)
-#ifndef writel_relaxed
#define writel_relaxed writel
-#endif
#ifdef CONFIG_64BIT
#ifndef __raw_readq
@@ -124,9 +112,7 @@ static inline u64 readq(const volatile void __iomem *addr)
{
return __le64_to_cpu(__raw_readq(addr));
}
-#ifndef readq_relaxed
#define readq_relaxed readq
-#endif
#ifndef __raw_writeq
static inline void __raw_writeq(u64 b, volatile void __iomem *addr)
@@ -136,9 +122,7 @@ static inline void __raw_writeq(u64 b, volatile void
__iomem *addr)
#endif
#define writeq(b, addr) __raw_writeq(__cpu_to_le64(b), addr)
-#ifndef writeq_relaxed
#define writeq_relaxed writeq
-#endif
#endif /* CONFIG_64BIT */
#ifndef PCI_IOBASE
--
1.9.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH v2 18/18] asm-generic: io: define relaxed accessor macros unconditionally
Now that no architectures using asm-generic/io.h define their own relaxed
accessors, the dummy definitions can be used unconditionally.
Cc: Arnd Bergmann a...@arndb.de
Signed-off-by: Will Deacon will.dea...@arm.com
---
include/asm-generic/io.h | 16
1 file changed, 16 deletions(-)
diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
index 9ccedeb06522..f5611abb82ed 100644
--- a/include/asm-generic/io.h
+++ b/include/asm-generic/io.h
@@ -53,27 +53,21 @@ static inline u32 __raw_readl(const volatile void __iomem
*addr)
#endif
#define readb __raw_readb
-#ifndef readb_relaxed
#define readb_relaxed readb
-#endif
#define readw readw
static inline u16 readw(const volatile void __iomem *addr)
{
return __le16_to_cpu(__raw_readw(addr));
}
-#ifndef readw_relaxed
#define readw_relaxed readw
-#endif
#define readl readl
static inline u32 readl(const volatile void __iomem *addr)
{
return __le32_to_cpu(__raw_readl(addr));
}
-#ifndef readl_relaxed
#define readl_relaxed readl
-#endif
#ifndef __raw_writeb
static inline void __raw_writeb(u8 b, volatile void __iomem *addr)
@@ -97,19 +91,13 @@ static inline void __raw_writel(u32 b, volatile void
__iomem *addr)
#endif
#define writeb __raw_writeb
-#ifndef writeb_relaxed
#define writeb_relaxed writeb
-#endif
#define writew(b,addr) __raw_writew(__cpu_to_le16(b),addr)
-#ifndef writew_relaxed
#define writew_relaxed writew
-#endif
#define writel(b,addr) __raw_writel(__cpu_to_le32(b),addr)
-#ifndef writel_relaxed
#define writel_relaxed writel
-#endif
#ifdef CONFIG_64BIT
#ifndef __raw_readq
@@ -124,9 +112,7 @@ static inline u64 readq(const volatile void __iomem *addr)
{
return __le64_to_cpu(__raw_readq(addr));
}
-#ifndef readq_relaxed
#define readq_relaxed readq
-#endif
#ifndef __raw_writeq
static inline void __raw_writeq(u64 b, volatile void __iomem *addr)
@@ -136,9 +122,7 @@ static inline void __raw_writeq(u64 b, volatile void
__iomem *addr)
#endif
#define writeq(b, addr) __raw_writeq(__cpu_to_le64(b), addr)
-#ifndef writeq_relaxed
#define writeq_relaxed writeq
-#endif
#endif /* CONFIG_64BIT */
#ifndef PCI_IOBASE
--
1.9.2
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
