From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758641AbdAKUmg (ORCPT ); Wed, 11 Jan 2017 15:42:36 -0500 Received: from mout.web.de ([212.227.17.12]:59470 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752023AbdAKUl0 (ORCPT ); Wed, 11 Jan 2017 15:41:26 -0500 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> Cc: LKML , kernel-janitors@vger.kernel.org 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> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit 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 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.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; } -- 2.11.0