[PATCH] ACPI: EC: fix compilation warning

[PATCH] ACPI: EC: fix compilation warning

[Hannes Eder]

Fix the warning introduced in commit c5279dee26c0e8d7c4200993bfc4b540d2469598,
and give the dummy variable a more verbose name.

  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 <hannes@hanneseder.net>
---
 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)) {
-- 
1.5.6.3

Re: [PATCH] ACPI: EC: fix compilation warning

[Alexey Starikovskiy]

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 <hannes@hanneseder.net>
Acked-by: Alexey Starikovskiy <astarikovskiy@suse.de>
> ---
>  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)) {

Re: [PATCH] ACPI: EC: fix compilation warning

[Len Brown]

On Sat, 29 Nov 2008, Alexey Starikovskiy wrote:

> 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 <hannes@hanneseder.net>
> Acked-by: Alexey Starikovskiy <astarikovskiy@suse.de>

applied on top of 11880 fix in acpi-test.

thanks,
-len