From patchwork Mon Aug 29 11:12:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 663591 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sN8D46hRyz9sdn for ; Mon, 29 Aug 2016 21:13:56 +1000 (AEST) Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3sN8D45tH6zDrgm for ; Mon, 29 Aug 2016 21:13:56 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mout.web.de (mout.web.de [212.227.15.4]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3sN8Bs71yNzDqB7 for ; Mon, 29 Aug 2016 21:12:53 +1000 (AEST) Received: from [192.168.1.3] ([77.182.223.245]) by smtp.web.de (mrweb004) with ESMTPSA (Nemesis) id 0M4Um4-1atDVc1zWm-00yj4G; Mon, 29 Aug 2016 13:12:24 +0200 Subject: [PATCH 4/5] powerpc-MSI-HSTA: Rename jump labels in hsta_msi_probe() To: linuxppc-dev@lists.ozlabs.org, Adam Buchbinder , Andrew Donnellan , Benjamin Herrenschmidt , Marc Zyngier , Michael Ellerman , Paul Mackerras , Scott Wood , Sudeep Holla , Thomas Gleixner References: <566ABCD9.1060404@users.sourceforge.net> From: SF Markus Elfring Message-ID: Date: Mon, 29 Aug 2016 13:12:18 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2 MIME-Version: 1.0 In-Reply-To: X-Provags-ID: V03:K0:QBMXw2l6YcqH+Z22EnfY4Wt/dxrttAUzZdqu7fBxh2S44L3mpnR nMnshV93h3M7DXU3SfXNSetY4GmSrr8vnWY+FrbgaRgWe68WJTdTLxkgiCyAjhR00yxI69n Nv/E5PMjRame29zzPo/u/ZRBocheDzQNewVcfsn6YDGDnBzTSdrtgDb3K8pL58SOXY9i/Sa ZL0HXpm7B5nD0J07AscLg== X-UI-Out-Filterresults: notjunk:1; V01:K0:R50CfrxtJmk=:qcWn9wD1GeosW6BudkWevG 022HPyZLrc0ewKm6qpp/jJP5nCuTsSi1CuWnqvwts71O+uGIEpU3Fcb8D4JAjX7bSdLfWFmMg sDjl2WJerBk46sk6TLV1uJdVL+88TKDso1hpPOoUpfAoTVKr1v4zmNL8hJkARor6/cRHiK2Qt 5cJU9R+HjfjIy+A3E+B8JU1CoNnOA6xVVrE5FF9V6iXAeD/VjJuow/heOjtAHIJxARKzwLf9h FmzEos0+mHOgw1jXMwFm8GqgBp7chbWi48f++Kc7Odi1m/EQCnzvyFw5l2uQMBo/Cu0dKlkW6 rUxrkFTbTKL2hN+98yOnbO3Xg7qPqzAljE5lReY6K7o6tBcGGFC+Pvdd9th/WBZ0hURi/154p HR7GF/CwgJ+EHrdFCx2G6/eniK64u6qNZWcHGeZJb2OcVbODjQNfwswps0FFwYJrGh3IqUZPC lLGbelyyvQELUp8Ha4UsHayD8EiqxSgdvuPvjvHFKPMs1c6iNeu0Oi/88l/rpM3JzYssQRYK1 bz2ATstjYZgiONw7c6u+L6gFzGcoUB5+EB7Zf50MA1RtcNWqcKKgBU0/T4FIeLcbZ6QQ4tGMf z/OE+Vw1Uf0A1ecRphaqDwHCx0DECEh+Q0Wz0crmKhrjRoud1Ji3p92pNJxtv1VSLw8VhF8oz /qGZQBeKEsurlL6PEY3DQywB+MA/ENxigDvvM0SXMQLKhbbqHgMUfvUEwQ8ncZd/4G3mLyMA1 nEp7AlE37TPAnK4oC+Xux/+KgO4zsuBBSjQPdyUUKToNRRRY/OrRKv4WwSd4kEHib5KgFBdRS f1BP7K3 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Julia Lawall , kernel-janitors@vger.kernel.org, LKML , Paolo Bonzini Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Markus Elfring Date: Mon, 29 Aug 2016 11:22:19 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- arch/powerpc/sysdev/ppc4xx_hsta_msi.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/arch/powerpc/sysdev/ppc4xx_hsta_msi.c b/arch/powerpc/sysdev/ppc4xx_hsta_msi.c index 691db9a..3097ddd 100644 --- a/arch/powerpc/sysdev/ppc4xx_hsta_msi.c +++ b/arch/powerpc/sysdev/ppc4xx_hsta_msi.c @@ -154,14 +154,14 @@ static int hsta_msi_probe(struct platform_device *pdev) ret = msi_bitmap_alloc(&ppc4xx_hsta_msi.bmp, irq_count, dev->of_node); if (ret) - goto out; + goto unmap_io; ppc4xx_hsta_msi.irq_map = kmalloc_array(irq_count, sizeof(*ppc4xx_hsta_msi.irq_map), GFP_KERNEL); if (!ppc4xx_hsta_msi.irq_map) { ret = -ENOMEM; - goto out1; + goto free_bitmap; } /* Setup a mapping from irq offsets to hardware irq numbers */ @@ -171,7 +171,7 @@ static int hsta_msi_probe(struct platform_device *pdev) if (ppc4xx_hsta_msi.irq_map[irq] == NO_IRQ) { dev_err(dev, "Unable to map IRQ\n"); ret = -EINVAL; - goto out2; + goto free_irq_map; } } @@ -180,14 +180,11 @@ static int hsta_msi_probe(struct platform_device *pdev) phb->controller_ops.teardown_msi_irqs = hsta_teardown_msi_irqs; } return 0; - -out2: + free_irq_map: kfree(ppc4xx_hsta_msi.irq_map); - -out1: + free_bitmap: msi_bitmap_free(&ppc4xx_hsta_msi.bmp); - -out: + unmap_io: iounmap(ppc4xx_hsta_msi.data); return ret; }