From patchwork Wed Jan 11 20:40:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 713969 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tzLQ866Xjz9t15 for ; Thu, 12 Jan 2017 07:41:04 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cRPhe-0000FD-RG; Wed, 11 Jan 2017 20:41:02 +0000 Received: from mout.web.de ([212.227.17.12]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cRPha-0000D6-Uh for linux-mtd@lists.infradead.org; Wed, 11 Jan 2017 20:41:00 +0000 Received: from [192.168.1.2] ([77.182.217.53]) by smtp.web.de (mrweb103 [213.165.67.124]) with ESMTPSA (Nemesis) id 0MXHXF-1bvsjZ3pBN-00WHsm; Wed, 11 Jan 2017 21:40:29 +0100 Subject: [PATCH 05/18] mtd-cfi_cmdset_0001: Use common error handling code in do_write_oneword() To: linux-mtd@lists.infradead.org, Boris Brezillon , Brian Norris , Cyrille Pitchen , David Woodhouse , Denys Vlasenko , Marek Vasut , Richard Weinberger References: <71189baa-8780-b80a-0b4d-9dae74763ba3@users.sourceforge.net> From: SF Markus Elfring Message-ID: <98176d77-b469-d0e3-9364-4035b0254b11@users.sourceforge.net> Date: Wed, 11 Jan 2017 21:40:26 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: <71189baa-8780-b80a-0b4d-9dae74763ba3@users.sourceforge.net> X-Provags-ID: V03:K0:BF9lrpxAwGHWEFNtA5+iyURPPeHnMR42bxc5AjstPXuIL1jMYgo clGOTLtB13kUL2hP5o3W2mJZ/+TC8hm7iK2pBv1hPLBvinRpNtcLApXyHxlzdo4ZrkFu6Jw aMz10ahpL5b50GSK+ixbn69O+DT8rurGDCH1QKq9DOYBrccXBb9/+lYO2JKbAUn1113IAfJ LtXF3ExvPw/bkpkkWLBHQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:lfq2hwlkdY4=:NIRivAhLqyHa+8gUAri0Ee lU2ZugMqdXo5fxrytqFjW6MGz8X6DuIu5eZ0ZuzpW24uEGVu4gNDnRPsfWroZ3xfy4JNBhPAm 2BwCRYCWQBMvVzxp/DiHbQRhR8+cFfFU4gmdRTSmwtxk2x6baILgVkHdCYVueUlgfmEKnm088 Y3PlZocFLpAotTPWyX52Ljdhx8R2cUq64fpvSkyda+bBCFXBE5n4OgInmpswCVeIXLEjpzzA6 R2fmbYmeeUME4clxSR61jbL8f0f127kKqOsIiliwzNeeBT7a3nnqLbYeoFKj10CrK3fWkFfEs 81Kd24EYhO/eCHUgXIf5f3T1djPVd5E0pMHrspz72FvZfq7QSr9JCzuXrmcPdDz1wfkZrTHWR vZq06sIEL6yQwtPJ9rOaBwBB7kbrJQav5LDj6VNMQmM6gM3CCv4KkgXLLXimx5BJKfur+GIag VT8S2OJxXFpEElTLmY2zAh6+ZF2zMhSMeMEWZ+Wlqa637xmjzwRuMono77301mt38Nm+sBtzU YEWUoQkmDazAvjCdcu/bh3mDV290gFExe2GBPsb1tmm45Ezj6MSOR385nItBG8CSMSZmu/80m V3QtnEJfzYThyUmSdlqi/+WVf/LKxME8PJitT3eQXbNijhOvZv8itXUrhVS8Fhh1JR2gUskCq 4veJbH8PaGoiphwYCDHxLfN1mc+eWSu7H6dykiA06Quuud5oiQ2IewEzXj5bzB7+GMjFUadWW Yit6E8JxRyIUaVapIHvL3Mm4fuxQv1Fyrfj9sWziEWZvbrL/eCq7lsx+gXnbXCKU0EPS3vRGl 9OZ9dT3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170111_124059_328832_9AED4C04 X-CRM114-Status: UNSURE ( 9.35 ) 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.17.12 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.17.12 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: Wed, 11 Jan 2017 16:40:47 +0100 Add a jump target so that a bit of exception handling can be better reused at the end of this function. Signed-off-by: Markus Elfring --- drivers/mtd/chips/cfi_cmdset_0001.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c index 0c0fa918c9ff..4b134e8beb93 100644 --- a/drivers/mtd/chips/cfi_cmdset_0001.c +++ b/drivers/mtd/chips/cfi_cmdset_0001.c @@ -1552,10 +1552,8 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip, mutex_lock(&chip->mutex); ret = get_chip(map, chip, adr, mode); - if (ret) { - mutex_unlock(&chip->mutex); - return ret; - } + if (ret) + goto unlock; XIP_INVAL_CACHED_RANGE(map, adr, map_bankwidth(map)); ENABLE_VPP(map); @@ -1600,6 +1598,7 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip, xip_enable(map, chip, adr); out: DISABLE_VPP(map); put_chip(map, chip, adr); +unlock: mutex_unlock(&chip->mutex); return ret; }