From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932649AbbLNWKl (ORCPT ); Mon, 14 Dec 2015 17:10:41 -0500 Received: from mout.web.de ([212.227.17.12]:61628 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753595AbbLNWKj (ORCPT ); Mon, 14 Dec 2015 17:10:39 -0500 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> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall 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> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:EFFnSgBGSET0WzsGwpBZBEEOTLptGAlAmX/YrAy/LcXrGIolR3p TD5Ze4tOqtPGi4NQSPnA9/2BgfHrZhQCOIaQsjCPhzOs6IMQ172rV6s3+hFqp6nDbxtHMpe vrP6frrCq9Tf1wqDAA1l8jFO6iV54h7pNgDQ2KcD3gLHf5jLYkHiV7Ntnr5Q1O4tsNr1r/a fzyeBsMyhRmr0OI+xQobg== X-UI-Out-Filterresults: notjunk:1;V01:K0:37qCr7UUQgU=:nk4ThuxRaNHRedjnQeimBT ohGxPf59eIidItZCNro1Epmmr+Sj/mcuuNDWhjgVAHbPIrEc2Jl2G0POCZ7F5tbzuMWYWKtvc BaZXRA22lhFbkI7YSeLkPkw8tViUWLCGJ7tmL3IPLUwWgwzmMNbmashqY5mwqi/x3NdClNRqu uP/VR3HHFtr+jzLf1jR4XRDMChVsg5j58oJ4o9NO4tC+5sswjxC6E8dylepBfr7+ISCLU+LOR +4hLESTM96nXltNS3+0H+qeS6OywkiiZW0UTrDR0VUPoE/DheWkx6XCq9O/VW8Kj1LnRvlscI tM8hkZYfjrn3OqrsrdJW9KAEDyp8n1+5NbxVkfiWA5IRC/5n3tdTq6hqXOkY9LpIiYN6oFwuG jZPzyjyXjZ9IyYIbKWeBnzkDem7EG4mmfryuFvMSrYJTKQpKwwAqeVWIuER+KStA87K1288rS jWJFnTBMFVKUzsNqzxS0vpfF/JGvuUJYQmg6xXV9pv188w6DhRA8MwtdDj7lpwmX9rzsdzzGc pefgbf0bcjShWTOuORkN4oYpyLGaY20+ZzrBxYWf/pkWdvEfw7CnIvobaOkL9/E35k1gnc5Fl WSgmLYzREOrHtOiS6Qn7dgLZYrSPKBr2RV7qbW9Pe/vT0o3NX2r7gCjK5mRTCzh5JRMTQa0So /L38Ql1WIBtkU4mLTYQMeCdvrn6AbXuJRdQGwBHJaAbIaQ0nDnpr88BBA00xjFBUxVay+U0rZ FxhC5P/ioYlnnnyHFvz1ylbtH022Gut0ruUCXA//+5BVNFuLbBnSDunDOa+3FIjaYSZ7vFlaO Na2RnDt Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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; } -- 2.6.3 From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Date: Mon, 14 Dec 2015 22:10:17 +0000 Subject: [POWERPC] bootwrapper: One check less in fsl_get_immr() after error detection Message-Id: <566F3E49.2010506@users.sourceforge.net> List-Id: References: <566ABCD9.1060404@users.sourceforge.net> In-Reply-To: <566ABCD9.1060404@users.sourceforge.net> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Benjamin Herrenschmidt , Michael Ellerman , Paul Mackerras , linuxppc-dev@lists.ozlabs.org Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall 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; } -- 2.6.3