From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751272AbdJDStF (ORCPT ); Wed, 4 Oct 2017 14:49:05 -0400 Received: from mout.web.de ([212.227.15.4]:50900 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751066AbdJDStD (ORCPT ); Wed, 4 Oct 2017 14:49:03 -0400 Subject: [PATCH 4/5] cris: nand: Delete an unnecessary local variable in crisv32_nand_flash_probe() From: SF Markus Elfring To: linux-cris-kernel@axis.com, Alexander Sverdlin , Boris Brezillon , Gregory Clement , Jesper Nilsson , Krzysztof Halasa , Mikael Starvik , Neil Armstrong , Shawn Guo , Tony Lindgren , Vladimir Zapolskiy Cc: LKML , kernel-janitors@vger.kernel.org References: Message-ID: Date: Wed, 4 Oct 2017 20:48:52 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:06mgc3+kF/GwQ+Z6/sbd5RjhoJIEV4TzI3WxyNy5ls7EZ4zeGBc W/7Qew9WVct0itfIYbAPSN8KMWSa1ja8Ec2GosvZCiIjR4PQFYoxZ0prM3WT1ubNnMfcq0O 8MELNOA3sE2xAryYsS/mOC0DZBR3WjLM+s5WHACvWlHLmSsFbRQgxYYhw1VRrtP+Fv3RgoM zNvVQ6f0R8zFLn+70n05w== X-UI-Out-Filterresults: notjunk:1;V01:K0:LgE1qGX0Kis=:Kvfff7Mh+x/XYbl+6BqaEt kyZ0pP6nFUYToQolV2LiJE8g7t5xyGgIZfXCHvCPC6JRguRHMOSAOhS2L2SnO885fYWFVDvtd CT0i3zMoyQX0CdkMeEbB1sOJ6P0dQopY7vz6JE5QjMTuEcgQsqt3UelslMuimD29nw1h/dwcz q4DaohTUNDwh6IadGJ7eLBT5nUtL02h8l0fEnZR1IhrUaqA1pjOptUWhv7D7OD1rGVRrrgb/K cH1HpbLdEtAGYESAmsSaUlehLuHnesLJKuA5iXLyPPFUGJXWTHDfv/VeaCOJcl6Pi2+oWz+w2 DOxA7E8ePaIkoOmT13wYTEhS0Yvmdm3jDNoaS3S+YZ1TdzttKL3CNBMVuzxKLIuRz3Oc2+LJZ YzIxQ8fN3mlGU03luCQbHWSsn4HHapYk5iAO2SaUeSJ7mhikvVfts86N5PGKYIjriX4TjvFS9 /QYlxzRto6CzdF48SmVIyQo+o/l5C7kkfQjbk5M3uw01+149YaPl/tDbRusV+4X2CkavhAzH5 2RMhK/BN+d/5t0g86qBy+kTMHco5qLtR2Sp4YuVHpwMLhgHzcEw5EZOaqwnMihgyguhHtFat1 cwsZOBSoYm9Po4rDOLKJLhxnPN0j8r9syWTGVhgIQ8aGSMmn9KC51hbqaNBZEAFFtDMLK8niL /1YCDkGoa8w3MEQByfYd57w4zDzll02EKrgmCFhkh9IJcqSfa6lmV4yxWupkVV1EVsqAZzn/T 5IqjMEKT3e6dA1wBag2+cGCquHUzni2nl/zgcwO9KCoOPw44Px9kojd6mmrQhbxsXE2TmGK+f cQQJDU9vlsH0lvR91hWCdbANzwfAoKBCck8Wq1QTiNEU/EuhuA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Wed, 4 Oct 2017 19:32:18 +0200 The local variable "err" was never read in this function. Thus remove it. Signed-off-by: Markus Elfring --- arch/cris/arch-v32/drivers/mach-a3/nandflash.c | 6 +----- arch/cris/arch-v32/drivers/mach-fs/nandflash.c | 10 ++-------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/arch/cris/arch-v32/drivers/mach-a3/nandflash.c b/arch/cris/arch-v32/drivers/mach-a3/nandflash.c index f30579ec8ad7..03a01bfa6ad9 100644 --- a/arch/cris/arch-v32/drivers/mach-a3/nandflash.c +++ b/arch/cris/arch-v32/drivers/mach-a3/nandflash.c @@ -108,7 +108,6 @@ struct mtd_info *__init crisv32_nand_flash_probe(void) struct mtd_info_wrapper *wrapper; struct nand_chip *this; - int err = 0; reg_pio_rw_man_ctrl man_ctrl = { .regf_NCE = regk_pio_yes, @@ -135,10 +134,8 @@ struct mtd_info *__init crisv32_nand_flash_probe(void) /* Allocate memory for MTD device structure and private data */ wrapper = kzalloc(sizeof(*wrapper), GFP_KERNEL); - if (!wrapper) { - err = -ENOMEM; + if (!wrapper) return NULL; - } read_cs = write_cs = (void __iomem *)REG_ADDR(pio, regi_pio, rw_io_access0); @@ -162,7 +159,6 @@ struct mtd_info *__init crisv32_nand_flash_probe(void) /* Scan to find existence of the device */ if (nand_scan(crisv32_mtd, 1)) { - err = -ENXIO; kfree(wrapper); return NULL; } diff --git a/arch/cris/arch-v32/drivers/mach-fs/nandflash.c b/arch/cris/arch-v32/drivers/mach-fs/nandflash.c index 5dfd72a89b8a..2b53f0c615ea 100644 --- a/arch/cris/arch-v32/drivers/mach-fs/nandflash.c +++ b/arch/cris/arch-v32/drivers/mach-fs/nandflash.c @@ -106,21 +106,17 @@ struct mtd_info *__init crisv32_nand_flash_probe(void) reg_gio_rw_pa_oe pa_oe = REG_RD(gio, regi_gio, rw_pa_oe); struct mtd_info_wrapper *wrapper; struct nand_chip *this; - int err = 0; /* Allocate memory for MTD device structure and private data */ wrapper = kzalloc(sizeof(*wrapper), GFP_KERNEL); - if (!wrapper) { - err = -ENOMEM; + if (!wrapper) return NULL; - } read_cs = ioremap(MEM_CSP0_START | MEM_NON_CACHEABLE, 8192); write_cs = ioremap(MEM_CSP1_START | MEM_NON_CACHEABLE, 8192); if (!read_cs || !write_cs) { printk(KERN_ERR "CRISv32 NAND ioremap failed\n"); - err = -EIO; goto out_mtd; } @@ -152,10 +148,8 @@ struct mtd_info *__init crisv32_nand_flash_probe(void) /* this->bbt_options = NAND_BBT_USE_FLASH; */ /* Scan to find existence of the device */ - if (nand_scan(crisv32_mtd, 1)) { - err = -ENXIO; + if (nand_scan(crisv32_mtd, 1)) goto out_ior; - } return crisv32_mtd; -- 2.14.2