Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1278603

[PATCH] mtd: nand: davinci: remove unnecessary if cases

Show all headers | View raw

remove unnecessary if cases

Signed-off-by: Anup Limbu <anuplimbu14@gmail.com>
---
 drivers/mtd/nand/davinci_nand.c | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c
index c72313d..1f86ee1 100644
--- a/drivers/mtd/nand/davinci_nand.c
+++ b/drivers/mtd/nand/davinci_nand.c
@@ -568,21 +568,16 @@ static struct davinci_nand_pdata
 		pdev->dev.platform_data = pdata;
 		if (!pdata)
 			return ERR_PTR(-ENOMEM);
-		if (!of_property_read_u32(pdev->dev.of_node,
-			"ti,davinci-chipselect", &prop))
-			pdev->id = prop;
-		else
+		if (of_property_read_u32(pdev->dev.of_node,
+			"ti,davinci-chipselect", &pdev->id))
 			return ERR_PTR(-EINVAL);
 
-		if (!of_property_read_u32(pdev->dev.of_node,
-			"ti,davinci-mask-ale", &prop))
-			pdata->mask_ale = prop;
-		if (!of_property_read_u32(pdev->dev.of_node,
-			"ti,davinci-mask-cle", &prop))
-			pdata->mask_cle = prop;
-		if (!of_property_read_u32(pdev->dev.of_node,
-			"ti,davinci-mask-chipsel", &prop))
-			pdata->mask_chipsel = prop;
+		of_property_read_u32(pdev->dev.of_node,
+			"ti,davinci-mask-ale", &pdata->mask_ale);
+		of_property_read_u32(pdev->dev.of_node,
+			"ti,davinci-mask-cle", &pdata->mask_cle);
+		of_property_read_u32(pdev->dev.of_node,
+			"ti,davinci-mask-chipsel", &pdata->mask_chipsel);
 		if (!of_property_read_string(pdev->dev.of_node,
 			"nand-ecc-mode", &mode) ||
 		    !of_property_read_string(pdev->dev.of_node,
@@ -594,9 +589,8 @@ static struct davinci_nand_pdata
 			if (!strncmp("hw", mode, 2))
 				pdata->ecc_mode = NAND_ECC_HW;
 		}
-		if (!of_property_read_u32(pdev->dev.of_node,
-			"ti,davinci-ecc-bits", &prop))
-			pdata->ecc_bits = prop;
+		of_property_read_u32(pdev->dev.of_node,
+			"ti,davinci-ecc-bits", &pdata->ecc_bits);
 
 		prop = of_get_nand_bus_width(pdev->dev.of_node);
 		if (0 < prop || !of_property_read_u32(pdev->dev.of_node,
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH] mtd: nand: davinci: remove unnecessary if cases Anup Limbu <anuplimbu14@gmail.com> - 2015-11-27 09:10 +0100

csiph-web