From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752525AbbLaU2c (ORCPT ); Thu, 31 Dec 2015 15:28:32 -0500 Received: from mout.web.de ([212.227.15.4]:59436 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751207AbbLaU23 (ORCPT ); Thu, 31 Dec 2015 15:28:29 -0500 Subject: [PATCH 3/3] mtd-rfd_ftl: Refactoring for erase_block() To: linux-mtd@lists.infradead.org, Brian Norris , David Woodhouse References: <566ABCD9.1060404@users.sourceforge.net> <56858E3A.7000706@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <56858FBC.70103@users.sourceforge.net> Date: Thu, 31 Dec 2015 21:27:40 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <56858E3A.7000706@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:VWJS5496Y+p4MliHG4dZTQLG3lR4hg/8qlE7o8u1HPd/bA6jcw7 Omkj7hDMPPeThKTNACDtH1ik3UHEs6Pdh78iLWO5nqcmXsgOf+8lAO0qzeFGiyK5k5Um3ef F0/nanFChSkwUcGs4cmypW6h/g0E8CLDaTsiWulau2BhFMsj4tuxhF4u3NVirV08GNHWjRF ocf0QZOyuxdEDE7Fpm+DQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:qq1B616ga7A=:jsidqxCPNYYZB+QJA1dXfg t3dwnduVTXRAiHZurZLzVAcVyCpbA5+IqQxRzte+z3RNp8bgG1ckTCw3QThQAUXmRWsjNda73 3Vt/eKl9wm2liflW2Mat3SRItNPq6P4+xbgBoaxnRaZYDKaw+Wm/4ehIPyCwVEESdwvCi265n 7AFMzGcuTNjctXRmFN57hFEIaS4pSPb8G5Nq6mKFqqTyP1zgR/sGjv/a5YJJe5B4hohH15XKD H6fryivq0X016N8kETDH6PI4Ug3tyrcSHVppMyaQWvWSNKIbl0mADXrT6XhlDkuDPqw2PWGcH gzq8jcmYUkSqucUgqoZobGc3ufBLvErF7uswfFexSfCppP7AmaBmDIy/mOrB1cTocjJLSW6dm G7gnKqOX1zdoFp0nlZtWUfXFiw0wFgZnPOyo9W608MziToI4vYGRvJM3ki08QLqt5idyneyGt TZwadmvLX/ms3b78ZdBJuB7Pg7gys+Qx9dNCajWh4uf24VrTiebQfkVXqms+xku/zl96Eyhsu uzZXJ2Rrx5Fu+wBqd9y1NxXXG/U7COvsX4R30oMqFwAfcXXpkB+jLwVir3M4q1bsO2nbjxH5X xmTdvKk4V89r0uQ9S0rwKCADu3/xrc/yEhlBEyEgfdFxkNTsHPNlyjy5w/veEIbJAjW1WcFmh zIsSY/sBQ31MTYQWoqvAU2rH4xzWCYsqs+ZMvokAG0yDiAo4U3J3VneSXxNutC2he6b3K6dTf 9zhMSEE83n1D5K9jAG7kEb0mdGU+L33w+8zjoRlwPuQc/edJt6WdiqCaXUDtxtth6xTFi14D7 rmSsOBj Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Thu, 31 Dec 2015 21:06:27 +0100 This issue was detected by using the Coccinelle software. * Return directly if a memory allocation failed. * Drop the explicit initialisation for the variable "rc" at the beginning then. 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 9b59423..8379447 100644 --- a/drivers/mtd/rfd_ftl.c +++ b/drivers/mtd/rfd_ftl.c @@ -326,11 +326,11 @@ static void erase_callback(struct erase_info *erase) static int erase_block(struct partition *part, int block) { struct erase_info *erase; - int rc = -ENOMEM; + int rc; erase = kmalloc(sizeof(struct erase_info), GFP_KERNEL); if (!erase) - goto err; + return -ENOMEM; erase->mtd = part->mbd.mtd; erase->callback = erase_callback; @@ -349,8 +349,6 @@ static int erase_block(struct partition *part, int block) (unsigned long long)erase->len, part->mbd.mtd->name); kfree(erase); } - -err: return rc; } -- 2.6.3