From patchwork Mon Aug 29 11:13:12 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: 663592 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sN8FS403Vz9s9G for ; Mon, 29 Aug 2016 21:15:08 +1000 (AEST) Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3sN8FS2rnczDsWK for ; Mon, 29 Aug 2016 21:15:08 +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 3sN8Cp423bzDsQb for ; Mon, 29 Aug 2016 21:13:42 +1000 (AEST) Received: from [192.168.1.3] ([77.182.223.245]) by smtp.web.de (mrweb002) with ESMTPSA (Nemesis) id 0MhUQ6-1bRjZJ0654-00MerK; Mon, 29 Aug 2016 13:13:15 +0200 Subject: [PATCH 5/5] powerpc-MSI-HSTA: Move three assignments 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: <4fd422ec-6133-65dd-0a0c-e8613fd4820d@users.sourceforge.net> Date: Mon, 29 Aug 2016 13:13:12 +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:0GtWUZTMXLVT8MMUBb4QKq/3tOpboeGhShKN1QT/6wd1durwp9y gQPW5zQcyhSiOpJBmnNYodMPKwtH4GrAEsAQi9OiH2S3dfRanI+8wCKMZYePf5sii2X9RAj 6XKQML0a4EfGvi1xmBjOuujNZS8q1Ta0SL8M1uieS/cHpddA0mDo5yFpzgzE/yyp4nxtMA0 p2+OWE5rKTiJ0fg2506RA== X-UI-Out-Filterresults: notjunk:1; V01:K0:Uh8xX1zNLqo=:OdeHAm9NIHOtHHJqgsyyjE YbDiW4vKjfBXZ84/99xYOlGeumHurMD+x2SymeQGd+DJW9IUhnI1SEpUS0k4UvaPjemwAiKXx R1TioFBlSQXVNWjPeiBP88OHH4Uzg1KlbC+vidD/C4ACepI6khjRniQWrdat66H85tEJ7N4f5 7DcLWp3HURkc2Q42reP5SV5z4mQbYRs2Db7UVaPzmdwALMgRpgAUqZDglLA111SVa24wEOUW/ OH53/znoXA1zQNYJBXbGo0zIKAKRfzQsiXGnZKV8Lu3+aR7elqO4+8C1idYohBp5C5v+T2KB5 3baL3dqmph4LU8ocB1lka1NI5U3x3CvXDmCLiLb/OvTtUV6nSmM0mioD/PtcHfJ1oW9A1Niz2 MNJZfrz0PnRcSarbZjjvdjUrT0ls8m2VQ/ki/O5rKhL395GGHlVzxo85DRE5YNRfxBzNPGTBC Abo3ky9UwrqTU94Xk8VSzx+/geoXuFotk7L5UL/QS0f9aTylXcyorTtVxRjZXes1NpWjk2KGH 4GcakOuRN3BISZI/uQz3H+SUKafJDLl4FZecg8GxCl6EWGy0BBd6VBdg17uGilXXAMjN13Xdh TINIEpIUMyrdpRX0H4ZikdVSB2ktvLaCIdqzRzEQ/MOpYNQRaTIrvmMgNfSEpnxPbWaBGqAhg mo45JtrZu2NTxUaje4naUw/VeLpUcdcCUF4RcxLqY22vKAQEdOPyGy8r8ZmJ0WTVix40vNBdP DesjD5WxQSbAGL8Z/HrzLwHbJoLqWbu8Ajnm3K30TkBA5J/iSk+ZdCUtBEe6VPYxrR63kU4GG uKVcXea 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:30:48 +0200 Move the assignments for three data structure members to the end so that they will only be performed if the desired resource allocations succeeded by this function. Signed-off-by: Markus Elfring --- arch/powerpc/sysdev/ppc4xx_hsta_msi.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/sysdev/ppc4xx_hsta_msi.c b/arch/powerpc/sysdev/ppc4xx_hsta_msi.c index 3097ddd..57014ce 100644 --- a/arch/powerpc/sysdev/ppc4xx_hsta_msi.c +++ b/arch/powerpc/sysdev/ppc4xx_hsta_msi.c @@ -143,10 +143,7 @@ static int hsta_msi_probe(struct platform_device *pdev) return -EINVAL; } - ppc4xx_hsta_msi.dev = dev; - ppc4xx_hsta_msi.address = mem->start; ppc4xx_hsta_msi.data = ioremap(mem->start, resource_size(mem)); - ppc4xx_hsta_msi.irq_count = irq_count; if (!ppc4xx_hsta_msi.data) { dev_err(dev, "Unable to map memory\n"); return -ENOMEM; @@ -179,6 +176,10 @@ static int hsta_msi_probe(struct platform_device *pdev) phb->controller_ops.setup_msi_irqs = hsta_setup_msi_irqs; phb->controller_ops.teardown_msi_irqs = hsta_teardown_msi_irqs; } + + ppc4xx_hsta_msi.dev = dev; + ppc4xx_hsta_msi.address = mem->start; + ppc4xx_hsta_msi.irq_count = irq_count; return 0; free_irq_map: kfree(ppc4xx_hsta_msi.irq_map);