From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Date: Thu, 31 Dec 2015 20:27:40 +0000 Subject: [PATCH 3/3] mtd-rfd_ftl: Refactoring for erase_block() Message-Id: <56858FBC.70103@users.sourceforge.net> List-Id: References: <566ABCD9.1060404@users.sourceforge.net> <56858E3A.7000706@users.sourceforge.net> In-Reply-To: <56858E3A.7000706@users.sourceforge.net> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-mtd@lists.infradead.org, Brian Norris , David Woodhouse Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall 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