From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755311AbdAKUpb (ORCPT ); Wed, 11 Jan 2017 15:45:31 -0500 Received: from mout.web.de ([217.72.192.78]:50602 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751091AbdAKUoi (ORCPT ); Wed, 11 Jan 2017 15:44:38 -0500 Subject: [PATCH 08/18] mtd-cfi_cmdset_0001: Rename a jump label in cfi_intelext_setup() 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: <6550d4b3-b024-247f-9954-c2bb67e3352a@users.sourceforge.net> Date: Wed, 11 Jan 2017 21:43:41 +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:KPAReAznOlAlAttb7XoONxBK6J9aEKmZcR1uKPdvdos4iVtnrDy +XDbGj8Z+PrLJrMZwnnLUOTZ8oRuyLgWRh3tSRACQO1Smr5eTwK5R5VaLGGtqWUzN0DwlLx K5lL3PwQHVmnPtL/DoaPl7HadrPKgQB94GXz8DKrWXTD8vk+mtFU1axrAqqv0hRATNko/0H HjyHacM3DgFKMpjkLiLRQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:rn87qD+meug=:3bEz8fLFM4aFPG0tR3I9ts gzS8KcRCZvPefP7Uf4psE13jO8I/F2y1/zqzijEX+9JWwIonuYy5EXNij2elrIQaAVq0od5nO B8pdEg4mwF0fMk42y1su9uLSKgQL2JEfggPABEjUD2dBD7+4LOO/StdJZA9p7hYQzkdc9mkUW eiTReFwEkbnHclhSohjK+07k8gmLsVzjOkJSFb1NRjyx2du9RLYaJPy1sZ7J3nrJU21skjLcu W/ay9T49uuVzaD3obrYM8R8wXz//WWvy5JXLHJiDisbcQzGVHkbmhEzw81wCVm/pdaEL/fwHM paVw2ZHxeVfoRXUxHp1tOCHS0++xeiatdIc3/H+NvTFaKiHdA0Qyt9uDXgrv2hLUwqyBOwgp4 oYWxqkyYC/cObTPoryiMiFOY7RcAE4Opv+tCk0mIoDlYKecgTeBgRirMZmt2W7qHb8Rp6usGk bGtm5wkPeXXbw1U1ig+wawxgDKYb+JLOyK/k/RB3jPEP3EZOebMIVDCwXxXgcCvlreKtZoPG1 bhEqdUwyPjnRWS59okK4ec7BtgoWyjKqHIycmTQrJqZ84RBwI0+3cOrxw2I1p6eDUybvbbdkR 13u5R+KUbELhnaArigCc/tmJjSBHCE+cPoB9h2Qa0rcDLtWep7Vtej1Bdb6vKLJDa0CTNV8ch peWmIcLbPmpzbSXxFwMI9iztYAuDBX4a04j2eEnKth0aPSNzKemLiafZzsJQko7932nNwYYiq goH9ogGSF74BlufsZKvFFEx85FFoiD3Nx9nxruti5Jk/wj0N/rbh4nI1nQCBagZWIWTFOgRdE bPOJfv0 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 17:49:05 +0100 Adjust a jump label according to the Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/mtd/chips/cfi_cmdset_0001.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c index 7f6ed7293e40..97329484555d 100644 --- a/drivers/mtd/chips/cfi_cmdset_0001.c +++ b/drivers/mtd/chips/cfi_cmdset_0001.c @@ -620,7 +620,7 @@ static struct mtd_info *cfi_intelext_setup(struct mtd_info *mtd) mtd->eraseregions[x].numblocks = ernum; mtd->eraseregions[x].lockmap = kmalloc(ernum / 8 + 1, GFP_KERNEL); if (!mtd->eraseregions[x].lockmap) - goto setup_err; + goto free_regions; } offset += (ersize * ernum); } @@ -628,7 +628,7 @@ static struct mtd_info *cfi_intelext_setup(struct mtd_info *mtd) if (offset != devsize) { /* Argh */ printk(KERN_WARNING "Sum of regions (%lx) != total size of set of interleaved chips (%lx)\n", offset, devsize); - goto setup_err; + goto free_regions; } for (i = 0; i < mtd->numeraseregions; i++) { @@ -650,13 +650,12 @@ static struct mtd_info *cfi_intelext_setup(struct mtd_info *mtd) /* This function has the potential to distort the reality a bit and therefore should be called last. */ if (cfi_intelext_partition_fixup(mtd, &cfi) != 0) - goto setup_err; + goto free_regions; __module_get(THIS_MODULE); register_reboot_notifier(&mtd->reboot_notifier); return mtd; - - setup_err: +free_regions: for (i = 0; i < cfi->cfiq->NumEraseRegions; i++) for (j = 0; j < cfi->numchips; j++) kfree(mtd->eraseregions[j * cfi->cfiq->NumEraseRegions -- 2.11.0