From patchwork Mon Dec 14 22:10:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 556670 X-Patchwork-Delegate: scottwood@freescale.com 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 79C6B1402D6 for ; Tue, 15 Dec 2015 09:17:20 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 5FD001A11AC for ; Tue, 15 Dec 2015 09:17:20 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org X-Greylist: delayed 334 seconds by postgrey-1.35 at bilbo; Tue, 15 Dec 2015 09:16:23 AEDT Received: from mout.web.de (mout.web.de [212.227.17.12]) (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 5A4111A0026 for ; Tue, 15 Dec 2015 09:16:22 +1100 (AEDT) Received: from [192.168.1.3] ([78.49.82.118]) by smtp.web.de (mrweb103) with ESMTPSA (Nemesis) id 0M73SD-1aTPWa3YI9-00wqRn; Mon, 14 Dec 2015 23:10:30 +0100 Subject: [POWERPC] bootwrapper: One check less in fsl_get_immr() after error detection To: Benjamin Herrenschmidt , Michael Ellerman , Paul Mackerras , linuxppc-dev@lists.ozlabs.org References: <566ABCD9.1060404@users.sourceforge.net> From: SF Markus Elfring Message-ID: <566F3E49.2010506@users.sourceforge.net> Date: Mon, 14 Dec 2015 23:10:17 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <566ABCD9.1060404@users.sourceforge.net> X-Provags-ID: V03:K0:EFFnSgBGSET0WzsGwpBZBEEOTLptGAlAmX/YrAy/LcXrGIolR3p TD5Ze4tOqtPGi4NQSPnA9/2BgfHrZhQCOIaQsjCPhzOs6IMQ172rV6s3+hFqp6nDbxtHMpe vrP6frrCq9Tf1wqDAA1l8jFO6iV54h7pNgDQ2KcD3gLHf5jLYkHiV7Ntnr5Q1O4tsNr1r/a fzyeBsMyhRmr0OI+xQobg== X-UI-Out-Filterresults: notjunk:1; V01:K0:l6xNX6Wn0Io=:X9MWQ7Za96k4D3ShMmOSLD mFvCFMIwVVYOVIfPlIkShGttsttAhH6ykltJWAq6FebJK5oXS8id7awLUXw+2LpOR8VAr3IYx wSMgC2s0yD+T9R/I7/0kEPg80FWcjzwcxYkjEovbqKFkSK+8d5v3XMaHQq8H/IyGatEcENVDJ 5WnpJSsjyzZBghXaheWclC4bcgAFF6+mzgJe+ZvG98S1Bn0RKKSXoIPJyngJNSm+I17l6vwJK eeNK5+6CPJE8jodPiC4dZ3QMGgt5sA2ervUD3E4a7wmzxAwcDH8Qdx6gPcpial5ZJlwMpH73e r2mNELgsc5qDwZVTjIKIEjXQSmyWwr/ACTnrudSlLK+ktjtZUPjvRe8Wj5rC1fo7wulJ+quXK J4d3FK6pFqRu1Zg7SL7r5k30JbO0wVqL5ap2WgqSAyLU66vty1rSJ6tezeUmOa0r+ZMnxKr8Q Kk7e32sAhDaqhKK4PXWvyx5unS5/XyA37dKnB1p8BrSsAr7cBKyqaN4yyAXvTqjLy2WxsenBq ZKBQ2hpXPd6D/4RNF+7gUilMOiGYaXGXZx1BY1YVA70qkX3k/D/K/0yslUPdmMAjeSbRiCu3r hZnZsr5xoYOv98KVuoE2pouMopPkRUcpqbSBLJLvm2qiepI8+HWI2BkCWtgnahr/aDjA5/dpR 6fdLt1z6TmStCyQJy3+V765qUx8HxA2uAjr1CPFbL0n1vL91hq4pQ/3NUr1hdFL/KxPBjBw5A bo0JZpF4xKrctxTHD/JAHg4Hdgjw7qp8oS6Ow2HkQJKTqOBG6K7cngJpXyn125T//YEIRWxcs NcgBDnS X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.20 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 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Markus Elfring Date: Mon, 14 Dec 2015 23:01:32 +0100 A status check was performed by the fsl_get_immr() function even if it was known already that a system setting did not fit to the expectations. This implementation detail could be improved by an adjustment for a jump label according to the Linux coding style convention. Signed-off-by: Markus Elfring --- arch/powerpc/boot/fsl-soc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/powerpc/boot/fsl-soc.c b/arch/powerpc/boot/fsl-soc.c index b835ed6..ff1dae3 100644 --- a/arch/powerpc/boot/fsl-soc.c +++ b/arch/powerpc/boot/fsl-soc.c @@ -34,24 +34,24 @@ u32 *fsl_get_immr(void) naddr = 2; if (naddr != 1 && naddr != 2) - goto err; + goto report_failure; size = getprop(soc, "ranges", prop_buf, MAX_PROP_LEN); if (size < 12) - goto err; + goto report_failure; if (prop_buf[0] != 0) - goto err; + goto report_failure; if (naddr == 2 && prop_buf[1] != 0) - goto err; + goto report_failure; if (!dt_xlate_addr(soc, prop_buf + naddr, 8, &ret)) ret = 0; } -err: - if (!ret) + if (!ret) { +report_failure: printf("fsl_get_immr: Failed to find immr base\r\n"); - + } return (u32 *)ret; }