From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754055AbbK0IFv (ORCPT ); Fri, 27 Nov 2015 03:05:51 -0500 Received: from mail-pa0-f44.google.com ([209.85.220.44]:34376 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751538AbbK0IFs (ORCPT ); Fri, 27 Nov 2015 03:05:48 -0500 From: Anup Limbu To: dwmw2@infradead.org, computersforpeace@gmail.com, linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Anup Limbu Subject: [PATCH] mtd: nand: davinci: remove unnecessary if cases Date: Fri, 27 Nov 2015 13:35:34 +0530 Message-Id: <1448611534-21142-1-git-send-email-anuplimbu14@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org remove unnecessary if cases Signed-off-by: Anup Limbu --- 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