Skip to contentSkip to conversation

mtd: brcmnand: Fix misuse of IS_ENABLED

PATCH Superseded Axel Lin 1 participant 1 message Aug 6, 2015

Subsystems (2)
Memory technology devices (MTD) NAND flash

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 mtd: brcmnand: Fix misuse of IS_ENABLED

While IS_ENABLED() is perfectly fine for CONFIG_* symbols, it is not for other symbols such as __BIG_ENDIAN that is provided directly by the compiler.

Signed-off-by Axel Lin <[email protected]>

---
Hi,
I don't have a big endian machine to test this, so I'd appreciate if someone can review and test this patch.

A similar misuse of IS_ENABLED is reported and fixed in:
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/drivers/dma/mv_xor.c?id=0ec9ebc706fbd394bc233d87ac7aaad1c4f3ab54

 drivers/mtd/nand/brcmnand/brcmnand.h | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)
drivers/mtd/nand/brcmnand/brcmnand.h +10 -8
index a20c736..c697a4e 100644
@@ -50,19 +50,21 @@ static inline u32 brcmnand_readl(void __iomem *addr)
 	 * Other architectures (e.g., ARM) either do not support big endian, or
 	 * else leave I/O in little endian mode.
 	 */
-	if (IS_ENABLED(CONFIG_MIPS) && IS_ENABLED(__BIG_ENDIAN))
-		return __raw_readl(addr);
-	else
-		return readl_relaxed(addr);
+#if defined(__BIG_ENDIAN) && IS_ENABLED(CONFIG_MIPS)
+	return __raw_readl(addr);
+#else
+	return readl_relaxed(addr);
+#endif
 }
 
 static inline void brcmnand_writel(u32 val, void __iomem *addr)
 {
 	/* See brcmnand_readl() comments */
-	if (IS_ENABLED(CONFIG_MIPS) && IS_ENABLED(__BIG_ENDIAN))
-		__raw_writel(val, addr);
-	else
-		writel_relaxed(val, addr);
+#if defined(__BIG_ENDIAN) && IS_ENABLED(CONFIG_MIPS)
+	__raw_writel(val, addr);
+#else
+	writel_relaxed(val, addr);
+#endif
 }
 
 int brcmnand_probe(struct platform_device *pdev, struct brcmnand_soc *soc);
Signature · 1 line
2.1.0