From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759256AbdAKUvv (ORCPT ); Wed, 11 Jan 2017 15:51:51 -0500 Received: from mout.web.de ([212.227.17.11]:61125 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755178AbdAKUuh (ORCPT ); Wed, 11 Jan 2017 15:50:37 -0500 Subject: [PATCH 14/18] mtd-cfi_cmdset_0002: 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: <63f5abca-b47b-75b5-ee7c-7430f589ced0@users.sourceforge.net> Date: Wed, 11 Jan 2017 21:49:27 +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:NdDjz1JgdP7+VSW6+QinGOa6nNQFdfMg0F152DYu4Z7nVFtQvbe dKDbykdjB20PlveFjVcQypSkb3bdKkfoZjPEWJnFAVmlgx1jMwV5BMpMHv+uHGg9W0M1NBY iQcNZB+NFn5hcXNswAntsBSUA2W6te1xJjSXXjOMt5P7VfzpPl8wQpR3O1mBvLk7MOfMciw M1tXAYe/hLWIBB4/5HH+Q== X-UI-Out-Filterresults: notjunk:1;V01:K0:a5l4JM1vKlA=:a0nlhnuHllNFQa980ics8e sl//ibZ9lToP2guZYIKo45poznhn52bOUaoz/gJ+eu+H5rBVHAWX4N/BaWFcskvYhu25iEbFh KJ5et8CQ9BwJMAHT1zmVjBbX8HCvy1ipczZDV/U/Vljt9zq8qbn1CGmd7j8Novi2ezTeLKzHK xVsFiE5KphQ1XeLOryOy0bch7bEZNS2OcpS5IXpXMmbKkYPG97NlqE0rRx27sVCpHjN94WQxa 4AoHzy3304uRT5j+ffzMmAU6/Gxj1GQtLCfYniR+REov02VPepVSmgCFm1kJD5pFiuAh98QV2 OTg2wqFjxGjmDnSrC3Mu4ToBu3UBSVkI3DQzvbBTVuSbZy5MHCBH+9hUwZ3OZ5H6fIbPYSs7R 8dGPNAZG4lJY11uDedm6HSldXAKGzxlhSrqBo3mHEhOCgnnKWw4quQ1LH+iScyw+kwtWIjMhC YIsqHB0a4q+cRB6Plw/aMIGbLop8njrHyBFhm4D+u6YMmPhvEE3SM8DLDmdWi4sTYDoO8tkFu jISGQaU5qTniPOclRe439L8Mhqbf6MiLS/8my6NGIQkKTeN5HndZpTVAMrQLGjyke81nfuPbw ufJmjwuqWGh5TOqOnsnS/kgIMLu7khKRnwBBGOJFtIno9pZt8yOs9Ra/KTKXatpcKRgExBmGr b2G4nJyc/9+cJBp9lNuQLbGNWJq1s5gG26HIH3aT/v13581snhydclE//gZYMmktldj6sxHP1 UIwdoKmxbMvig7jf3Dpow+Jfj6bsLGgAhn9qUkijv+gMkMXXOMhYwfxl9A94lxkCp1wAoquYU rc8c3h4 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 19:08:01 +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_0002.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c index 05d740e8eb51..0c4751eb6efe 100644 --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c @@ -1577,10 +1577,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; pr_debug("MTD %s(): WRITE 0x%.8lx(0x%.8lx)\n", __func__, adr, datum.x[0] ); @@ -1664,6 +1662,7 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip, chip->state = FL_READY; DISABLE_VPP(map); put_chip(map, chip, adr); +unlock: mutex_unlock(&chip->mutex); return ret; -- 2.11.0