From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754160AbYK2TgU (ORCPT ); Sat, 29 Nov 2008 14:36:20 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752030AbYK2TgH (ORCPT ); Sat, 29 Nov 2008 14:36:07 -0500 Received: from charybdis-ext.suse.de ([195.135.221.2]:48890 "EHLO emea5-mh.id5.novell.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751691AbYK2TgG (ORCPT ); Sat, 29 Nov 2008 14:36:06 -0500 Message-ID: <493199A4.5020203@suse.de> Date: Sat, 29 Nov 2008 22:36:04 +0300 From: Alexey Starikovskiy User-Agent: Thunderbird 2.0.0.18 (X11/20081125) MIME-Version: 1.0 To: Hannes Eder CC: Len Brown , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: Re: [PATCH] ACPI: EC: fix compilation warning References: <49318541.0aec660a.0efb.3436@mx.google.com> In-Reply-To: <49318541.0aec660a.0efb.3436@mx.google.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hannes Eder wrote: > Fix the warning introduced in commit c5279dee26c0e8d7c4200993bfc4b540d2469598, > and give the dummy variable a more verbose name. Thanks! > > drivers/acpi/ec.c: In function 'acpi_ec_ecdt_probe': > drivers/acpi/ec.c:1015: warning: ISO C90 forbids mixed declarations and code > > Signed-off-by: Hannes Eder Acked-by: Alexey Starikovskiy > --- > drivers/acpi/ec.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c > index c16e09b..60db1b2 100644 > --- a/drivers/acpi/ec.c > +++ b/drivers/acpi/ec.c > @@ -980,6 +980,7 @@ int __init acpi_ec_ecdt_probe(void) > { > acpi_status status; > struct acpi_table_ecdt *ecdt_ptr; > + acpi_handle dummy; > > boot_ec = make_acpi_ec(); > if (!boot_ec) > @@ -1012,7 +1013,6 @@ int __init acpi_ec_ecdt_probe(void) > } > /* This workaround is needed only on some broken machines, > * which require early EC, but fail to provide ECDT */ > - acpi_handle x; > printk(KERN_DEBUG PREFIX "Look up EC in DSDT\n"); > status = acpi_get_devices(ec_device_ids[0].id, ec_parse_device, > boot_ec, NULL); > @@ -1023,7 +1023,7 @@ int __init acpi_ec_ecdt_probe(void) > * which needs it, has fake EC._INI method, so use it as flag. > * Keep boot_ec struct as it will be needed soon. > */ > - if (ACPI_FAILURE(acpi_get_handle(boot_ec->handle, "_INI", &x))) > + if (ACPI_FAILURE(acpi_get_handle(boot_ec->handle, "_INI", &dummy))) > return -ENODEV; > install: > if (!ec_install_handlers(boot_ec)) {