ACPI: EC: fix compilation warning

commit 3e54048691bce3f323fd5460695273be379803b9 upstream.

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>
Acked-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 5d8a76a4c8bdfc5e38072f31910dfbe6bc4166ed..e618cbe87b5804fe8f8528d7cfd1af4b5ac62a71 100644 (file)
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -970,6 +970,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)
@@ -1002,7 +1003,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);
@@ -1013,7 +1013,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)) {