From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934383AbcIEUW0 (ORCPT ); Mon, 5 Sep 2016 16:22:26 -0400 Received: from mout.web.de ([212.227.17.12]:50242 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755477AbcIEUWV (ORCPT ); Mon, 5 Sep 2016 16:22:21 -0400 Subject: [PATCH 6/7] ACPI-APEI-HEST: Reduce the scope for a variable in acpi_hest_init() To: linux-acpi@vger.kernel.org, Len Brown , "Rafael J. Wysocki" References: <566ABCD9.1060404@users.sourceforge.net> <9834b713-2c7b-ad6d-76a5-b1db40f561fc@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, trivial@kernel.org, Julia Lawall , Paolo Bonzini From: SF Markus Elfring Message-ID: <3dcbbc1b-7af3-4d5f-2851-88c115c5c459@users.sourceforge.net> Date: Mon, 5 Sep 2016 22:22:07 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <9834b713-2c7b-ad6d-76a5-b1db40f561fc@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:xrll2MJuHVoE7yuuFFGBCg5aG51nnUYcKdYkJ78fXlTZESS2n13 Tz1Z3k+F3BMCEOgAtsjctRh3MTswu1NeAPjraveRX+i3zxq61378bAgEf7qnTYLSH8SEQd4 gmQie/ZiW45dQhHGXzk7BtZs7tBA3EOdV/I+yRUL2au41RjPeF/VFhgOPnjmUGSG6XkiD2O omALLmEN7tliDcNSvlLHA== X-UI-Out-Filterresults: notjunk:1;V01:K0:RFO3TKWocjA=:FTpu8qblLFZqsonRa0vWTx Xi4f+O4TzBjxdSiz5yu17jz/sRBNtXPRMRsVm7/THKaasBaQ0FUOWBS45eeyFoht/Ey6vLdvd 9cL0wE5oC+hTGRgML2eBlbwUihz3c9g5ERvaTXLyfhA8Rv1pK89L4Qv5Q2lJaLdS/tm0GuFrl YDVlA38FAibL0f556W248dJMipXd42eVLn1r9LAg2iPjCS6c3f/quczARJGSRTCa+M7m5DtjX MuCOJFEwLsiUKDpvEjrodBDlJhIyDYPKE2YvvhrJXWjJWytjwjgMW35zdRieR/dCKbZ2wV4TP 3X2545zupnzC81mM1gkyhISGX2P1lRyb3SDHkob70igCeaCoepMovHfQrj0ExzkZjwTzZdDcN sZDnrPcIQfiiSRd3aMmDUbqnf9vOs0f7QeF33TZYxgCIwgtKQmnF55TIxo0JGIxse8Sje6r8L mHM8PCVaTORcIsNOVNzAAgq3odVsDDg0D9vOqhpa4est/EU9ChvrxeC895NlZwv6bLz4tjgDI aYN7qcyqwDXjjoOXXkYtegCaOGd0UX0mD1JDhKbGvj0kd5NHc9CGKHnOOiGhLktPE3cxV6itR YyVTJvHJSDCZzJ1/3qSeYtd8nK81a4QnWixw/J3O2hdhMZCUndqZsgIy+mAyUzqyy2SNaEBzh xC3rzD3o8hS69ctxyJw2F0/Zw4S+ETOVdGAHiHZthUgBKLNjW6Jx3N5ZLEgOFEIsNwewSe1oF lZ8Q47t3wJye5HlTIgQ5csVfCl2aBH6wHfyFhwFOGAzyc99Vzj994SjmOkDAoxV1HvCg3bnaX EyvvaHH Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Mon, 5 Sep 2016 21:50:34 +0200 Move the definition for the local variable "ghes_count" into an if branch so that the corresponding setting will only be performed if GHES could be enabled by this function. Signed-off-by: Markus Elfring --- drivers/acpi/apei/hest.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c index ddff1b1..0e629c0 100644 --- a/drivers/acpi/apei/hest.c +++ b/drivers/acpi/apei/hest.c @@ -216,7 +216,6 @@ void __init acpi_hest_init(void) { acpi_status status; int rc = -ENODEV; - unsigned int ghes_count = 0; if (hest_disable) { pr_info(HEST_PFX "Table parsing disabled.\n"); @@ -238,6 +237,8 @@ void __init acpi_hest_init(void) apei_hest_parse(hest_parse_cmc, NULL); if (!ghes_disable) { + unsigned int ghes_count = 0; + rc = apei_hest_parse(hest_parse_ghes_count, &ghes_count); if (rc) goto disable_hest; -- 2.10.0