From patchwork Sat Jan 6 15:10:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 856387 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="uMCaCXh9"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zDQ3J45sJz9s7G for ; Sun, 7 Jan 2018 02:11:08 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date: Message-ID:References:To:From:Subject:Reply-To:Content-ID:Content-Description :Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=y9uv6H5WQwkdLcPuf7bVqUyErRT9M3fYaSiEiVe64xQ=; b=uMCaCXh967JZf9 w1X1KtplHyNh553EdeEK5macWf43Nu4p+55eecdKIyQiHLf6T1fPeADqWBCJ4pQ6ZaBHkqY0ozR5U uIe99Sw8JodSyfPBDU+Wlzu8p+x+EKv1MliZuBcDUSdd1DPYJChmACGKv8kQ2n6tplV5ZqSmNLbL3 0SSI2JkkwzfZ2/noXVbkzM+7gK/FOuo5F3L8olwYtv4KJGz7sTwAvym0KWlPk3Vz9fvDHm2QD13xy yssPLeK23KL7NbQeLirL7cMc4u06FWvbjDHFI/4RMJ8fCZQ6vSlAEdasfNypyzQWzaTrJT5nJM9+g WqALnQwWlASg7TqDgURw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eXq7l-0001oY-1b; Sat, 06 Jan 2018 15:11:05 +0000 Received: from mout.web.de ([212.227.15.14]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eXq7h-0001mq-JJ for linux-mtd@lists.infradead.org; Sat, 06 Jan 2018 15:11:03 +0000 Received: from [192.168.1.3] ([85.182.74.56]) by smtp.web.de (mrweb004 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MevzF-1eEH1s1FwP-00OVF3; Sat, 06 Jan 2018 16:10:41 +0100 Subject: [PATCH 4/5] mtd/rfd_ftl: Return directly after a failed kmalloc() in erase_block() From: SF Markus Elfring To: linux-mtd@lists.infradead.org, Boris Brezillon , Brian Norris , Cyrille Pitchen , David Woodhouse , Marek Vasut , Richard Weinberger References: Message-ID: <7b381eef-c54f-d2c9-7281-a90d519c22f1@users.sourceforge.net> Date: Sat, 6 Jan 2018 16:10:40 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.2 MIME-Version: 1.0 In-Reply-To: Content-Language: en-GB X-Provags-ID: V03:K0:F7JGxL3M42F4E7pULqa8dQapOf/q99MYq8W4cfdwRbexVqhKfV6 wrlWybuqNbjd52MaTp88GSVnKxRTE6WZQcvJ1qYQtC/M5uw56unEIC6Nml74S3+NpnMF1UA FQkMnwNjEzIsxqIRgVXa5q2SaJlwPWC324+YFeqgS63qG1T2M8LUgxPG0FRnrsXUROfhMgZ RXizVXSA9zp+UDiamtLPg== X-UI-Out-Filterresults: notjunk:1; V01:K0:LbwBnzPeB10=:wDP/t4lVn321Oljz7XaBCJ QPvVfNf/AzQWbGDQ7+NkEJEAzuaLb1W3cZw7YKYSRSR9lAKLknCNdlNHVGrMh/rydows389t1 98GwjWiwRquIj0mhOq7ct3FAj6FrlJU9hK6qjdMZOqXasFXMiLvlHgtcRR6QDi7wNibebxBIC v5y3R370xp3o1SvLRpvZSWVmDP4uS1zVaXxh/veqxMC1/+0WaP4ei7DsJw6q7iLJq/4uxthQH xNhmGQYYrhBqn4B3dK1I0dvVzY2ETjmozcltENkdarr+R7I2/ApSAh05hFlVPtnBcB5hLbUQE gGMLeDOMMPT1c8ODukCdutToyv7x3jeFt99sfG5P4OW2u4eJ4JNJ9V71DTI25lDp439M+5Tw6 r40PkPfqCrJVEv5hJusZvvhlolDMKAS7sIQ0ljOkirnO6xwOF3QobYjyCUaJsTFlRwzm09DPW w6EMJwkgH+Op0tSajxjcQuaPd9EwnIwrAvJRFiIkoA/zC29k9j6diChdNVGz1rwUXwml/H21b 0Ej6L4R69dh4FVWM3ArFmAsWcuhM/o+wBOAvkuOhwkYbR1nJ0KAHrtPNLiCh0FkrofZxVkZsr bmzU7iQoYtyaviela5vlyM4z2jG8KLdE1ZmfbZazHAE7V/STo3XLC9VTH6oOJ1bIO8eCw0dY1 KJYmQhZKnLWXbnMWiz6KffdvG9OKpRNV59u/wzRUMJH/f67SAxuCPmyim+fCimqbD3WtUhcg/ QJZValXH1lPY+NIEWsQfWyHrOVu/GtN6Ih9he8UPwUU3MrewkaF0WKlZSDQf6QI1zs6XImFKE l8SpHQGYrUD4+I5eouTJ3eyeZK0Xqu+iRz+gRTrbBU/G07Mb7U= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180106_071101_977498_877B1118 X-CRM114-Status: UNSURE ( 9.93 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [212.227.15.14 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [212.227.15.14 listed in wl.mailspike.net] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kernel-janitors@vger.kernel.org, LKML Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Markus Elfring Date: Sat, 6 Jan 2018 15:18:28 +0100 * Return directly after a call of the function "kmalloc" failed at the beginning. * Delete an initialisation for the variable "rc" and the jump label "err" which became unnecessary with this refactoring. Signed-off-by: Markus Elfring --- drivers/mtd/rfd_ftl.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/mtd/rfd_ftl.c b/drivers/mtd/rfd_ftl.c index dcf1b88e1193..e3155ec4be64 100644 --- a/drivers/mtd/rfd_ftl.c +++ b/drivers/mtd/rfd_ftl.c @@ -323,11 +323,11 @@ static void erase_callback(struct erase_info *erase) static int erase_block(struct partition *part, int block) { - int rc = -ENOMEM; + int rc; struct erase_info *erase = kmalloc(sizeof(*erase), GFP_KERNEL); if (!erase) - goto err; + return -ENOMEM; erase->mtd = part->mbd.mtd; erase->callback = erase_callback; @@ -346,8 +346,6 @@ static int erase_block(struct partition *part, int block) (unsigned long long)erase->len, part->mbd.mtd->name); kfree(erase); } - -err: return rc; }