From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Date: Mon, 05 Sep 2016 20:22:07 +0000 Subject: [PATCH 6/7] ACPI-APEI-HEST: Reduce the scope for a variable in acpi_hest_init() Message-Id: <3dcbbc1b-7af3-4d5f-2851-88c115c5c459@users.sourceforge.net> List-Id: References: <566ABCD9.1060404@users.sourceforge.net> <9834b713-2c7b-ad6d-76a5-b1db40f561fc@users.sourceforge.net> In-Reply-To: <9834b713-2c7b-ad6d-76a5-b1db40f561fc@users.sourceforge.net> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-acpi@vger.kernel.org, Len Brown , "Rafael J. Wysocki" Cc: LKML , kernel-janitors@vger.kernel.org, trivial@kernel.org, Julia Lawall , Paolo Bonzini 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