From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751314AbdJDSus (ORCPT ); Wed, 4 Oct 2017 14:50:48 -0400 Received: from mout.web.de ([212.227.15.14]:61427 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751066AbdJDSur (ORCPT ); Wed, 4 Oct 2017 14:50:47 -0400 Subject: [PATCH 5/5] cris: nand: Split a condition check 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: <290ad3d7-eb40-5c60-068f-3835063babc2@users.sourceforge.net> Date: Wed, 4 Oct 2017 20:50:37 +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:+YdzmG7bwbPJtIGFDJvcrfFZ1tMGDpyl17e2er4VC+Yu/LkiB7e +Usr9hS5bev6Bduo9g0gsCO2Up0jrs69VQGiFyxxyheQBe4OTqXbrFYH4HARyLaUe+/xHm9 Aw61Ysr/HcK+Mo18949JAVxd/+MgxLqZIbO/FD3hHxjLN/AxF7JplR4gFk1Z312HL5wB+sO 2qvx0Xhx80ku8S29GRaGw== X-UI-Out-Filterresults: notjunk:1;V01:K0:U/CpXF7ljuc=:FnYCv7bDPkAIoPHtVvkihD YrtvBEfBY8Ghb4XGpDDDWTHuxu+eqIK+OD6dTCTNrpcNmY46qWxS7fB4/hIespgxHmI4iEhNU lOUpCWXcLCYzEnD5DhyG++0uWXY7mcc8WZ8NSd/6P2dkjzxXq3YMVMPdjSBOtntHFPgcSY8du 9zcNvHoje3xLt+YPs8sxkqA4AQwQ+o19IQyEVjbsi8qc/vBzRkgCfXLGKZSWCRASg6Pus9YN+ oi5tYbrJLbfyg0400AlUr1f4gwNrvBrn04XlL7qs40BVAWM08xOBmRp6O2m2FxdUzuzz+/cnM JPXQkn+yLee1bKKKr4496nOnCjsgqrTsy+fQ5x4wW7oQ0LvdAucTJnr/YJkhBtgDFbwQlgKKA k1+vKzYpScZ7WU4TOtg7/bMGkfpl9uVLKW7f5RQaK1CK4IeKv2x3qrLtCJJDeoGfvcwm58KI+ U4BdTPd19XX7Zzthvf+Dvbk7AJcZyEp8uhcDZWRlA0WFoQUOz7HBk/r/JkUEmzhTysJ7Rk4ZU A1duhlcs++AWT12x646vpcMlheaT6nawBLf2MkXJN124hZWEOLQOZTx46D1n7vCD1FpoU284F qZY66dbo3vqU2OmvcNJl7Bbhe6BAbbnO9a5kbgBmQ+01ANO7P6e2c23CIaZhoAsbkVWYl9vSa qCUEHVYJGelBVGeeqTRheCDi09KaVEaRwRWDfpAK3k8FJ16mplW6mBb3JUOpuSBM3bNS+HBTS zOlcx4In+ysYGMy/7VwktrwOwZ+R3v19FLJyX5MW5CkHyT/4QpoXZsFDbuxIe4vGhD38ig3jR GMprhYcOhZgT8KrYk++QuUVF9NVMQpqQ+PA3nEC4oT86bIOZtw= 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 20:02:12 +0200 * Split a condition check for failed calls of the function "ioremap" so that the return value in the variable "write_cs" will also be immediately checked. * Adjust jump targets according to the Linux coding style convention. Signed-off-by: Markus Elfring --- arch/cris/arch-v32/drivers/mach-fs/nandflash.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/arch/cris/arch-v32/drivers/mach-fs/nandflash.c b/arch/cris/arch-v32/drivers/mach-fs/nandflash.c index 2b53f0c615ea..564218a12213 100644 --- a/arch/cris/arch-v32/drivers/mach-fs/nandflash.c +++ b/arch/cris/arch-v32/drivers/mach-fs/nandflash.c @@ -113,13 +113,17 @@ struct mtd_info *__init crisv32_nand_flash_probe(void) 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) { + if (!read_cs) { printk(KERN_ERR "CRISv32 NAND ioremap failed\n"); goto out_mtd; } + write_cs = ioremap(MEM_CSP1_START | MEM_NON_CACHEABLE, 8192); + if (!write_cs) { + printk(KERN_ERR "CRISv32 NAND ioremap failed\n"); + goto unmap_read; + } + /* Get pointer to private data */ this = &wrapper->chip; crisv32_mtd = nand_to_mtd(this); @@ -149,13 +153,14 @@ struct mtd_info *__init crisv32_nand_flash_probe(void) /* Scan to find existence of the device */ if (nand_scan(crisv32_mtd, 1)) - goto out_ior; + goto unmap_io; return crisv32_mtd; -out_ior: - iounmap((void *)read_cs); +unmap_io: iounmap((void *)write_cs); +unmap_read: + iounmap((void *)read_cs); out_mtd: kfree(wrapper); return NULL; -- 2.14.2