From: Fabio Estevam <fabio.estevam@freescale.com>
Date: Tue, 17 Nov 2015 15:58:50 +0000 (-0200)
Subject: mtd: mxc_nand: Remove bit-or operation with zero
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1b15b1f5a01019524815a9ce5c575f3b2068e7f8;p=linux-beck.git

mtd: mxc_nand: Remove bit-or operation with zero

Doing a bit-or operation with zero is pointless.

Remove this unneeded bit-or.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
---

diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index 7922d318ebb8..f507d361b1a6 100644
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@ -1067,8 +1067,7 @@ static void preset_v3(struct mtd_info *mtd)
 
 	/* Blocks to be unlocked */
 	for (i = 0; i < NAND_MAX_CHIPS; i++)
-		writel(0x0 |	(0xffff << 16),
-				NFC_V3_WRPROT_UNLOCK_BLK_ADD0 + (i << 2));
+		writel(0xffff << 16, NFC_V3_WRPROT_UNLOCK_BLK_ADD0 + (i << 2));
 
 	writel(0, NFC_V3_IPC);