From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751213AbdJDSrj (ORCPT ); Wed, 4 Oct 2017 14:47:39 -0400 Received: from mout.web.de ([212.227.15.14]:60742 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751114AbdJDSri (ORCPT ); Wed, 4 Oct 2017 14:47:38 -0400 Subject: [PATCH 3/5] cris: nand: Delete a jump target 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:47:28 +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:g2GTDJBtIbCENIPADYBnj9FvX0MdpmeLCQ+8frXj/9Zx28taN+R i2ziRcnjphWdY3MxgNJF9yzZrLCqiU5ZpMKav1bDB9plapp8WZPFzbbCUY6GjCqV0LF/kCF lOTw2EK3JU+ib/BOPJzrJBYkKRq4C815C3btxzHf8zgqo7AQpCyAT5cHIctEKLqu/b204oi MPrDgt36dm43E15Ouwfjw== X-UI-Out-Filterresults: notjunk:1;V01:K0:dH8P70Cw+uI=:A0UbupcT0/iB7oJ7PBUHnP PYZLq2v7Gid5bvzwfwQbmeLk+pqFhncNH2xbdsAZHgXW3kb/H2nUUNGFD2zo0bVdeB05tor3a 4n+2lLvy5miBRcnKF4tapbI20fXGYnBWht3bFXMRHe6cqvSaee6POTWlWTE7ogGOSACD2PVSf ACzFeUt63kD6W62e1SvuFm34aXICk5FSVxp80+geeljknmma2Q2A/D0FWPWx079jFBqdaF9aW 4EHuqGU6GhsrIndL92uvyRGurJGSBzs/PrTm8tyqHwT8mM2jO2czW/K7I20XyTBy9kq9hQ/4c G8kWw+WUY2O9QFm5LDCYpqAu+ELg/4AYWPfAqMg1KXoFWceqazfaIMk5z4hvyirjcK1ygAJyy DYr771SH93TqAbH2d22kSo3nYt9ZSRZ4f5ekLnkZPcUhLN5MYO9sc1xL22lGr9bVUHWtrPtcT sChmpTMv/ZThefm2Hu0xKu6xf9kLzxODpdFb/VYHc68bvwSrwNb4f/LmjxMqChGZNgIQ9OBZZ dGwGXQKfcsw+f5LRuJ7IOjClPMgxAAdCqx0YLVmdBATK5NKINY9dR6v8M7OTQ30jQdelaWOg/ uzKQhlFBjZgrUVV3VTv+BhcBvHt9W2uAFQpktEkOk5F57hNl7vdUyq60rF9F/AMAx75+EoQn0 IGwGNxujbZwbI+gBS2+bdliuXMZQSmF3sMhA0N3IyseNeXS1Qzu82M4fLiO3NGCCqyLAeks/U WN4HYDqgigQ5PTMOoRXJDjLuEfn4wHRvPQgaoFTCqcdJoixXGm/3nBv5k3jvlWlJowDTdu0/s leLHYdI+mBBPoSwNOctkgL6WiXLRnCnqNNQnMzMPTEGkrBFIc8= 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 18:55:01 +0200 * Move a bit of exception handling code into an if branch because the code was used only for one case before. * Delete the jump target "out_mtd" which became unnecessary with this refactoring. Signed-off-by: Markus Elfring --- arch/cris/arch-v32/drivers/mach-a3/nandflash.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/cris/arch-v32/drivers/mach-a3/nandflash.c b/arch/cris/arch-v32/drivers/mach-a3/nandflash.c index 3b5be9b984b4..f30579ec8ad7 100644 --- a/arch/cris/arch-v32/drivers/mach-a3/nandflash.c +++ b/arch/cris/arch-v32/drivers/mach-a3/nandflash.c @@ -163,13 +163,10 @@ struct mtd_info *__init crisv32_nand_flash_probe(void) /* Scan to find existence of the device */ if (nand_scan(crisv32_mtd, 1)) { err = -ENXIO; - goto out_mtd; + kfree(wrapper); + return NULL; } return crisv32_mtd; - -out_mtd: - kfree(wrapper); - return NULL; } -- 2.14.2