diff options
author | Hannes Eder <hannes@hanneseder.net> | 2008-11-29 01:21:29 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-11-30 00:10:31 -0500 |
commit | 3e54048691bce3f323fd5460695273be379803b9 (patch) | |
tree | 53961b52b6db754a48f02fb93425c78379719f9b /drivers/acpi | |
parent | c5279dee26c0e8d7c4200993bfc4b540d2469598 (diff) |
ACPI: EC: fix compilation warning
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>
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | 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 3ba034fffda5..6276e5c0fefd 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c | |||
@@ -979,6 +979,7 @@ int __init acpi_ec_ecdt_probe(void) | |||
979 | { | 979 | { |
980 | acpi_status status; | 980 | acpi_status status; |
981 | struct acpi_table_ecdt *ecdt_ptr; | 981 | struct acpi_table_ecdt *ecdt_ptr; |
982 | acpi_handle dummy; | ||
982 | 983 | ||
983 | boot_ec = make_acpi_ec(); | 984 | boot_ec = make_acpi_ec(); |
984 | if (!boot_ec) | 985 | if (!boot_ec) |
@@ -1011,7 +1012,6 @@ int __init acpi_ec_ecdt_probe(void) | |||
1011 | } | 1012 | } |
1012 | /* This workaround is needed only on some broken machines, | 1013 | /* This workaround is needed only on some broken machines, |
1013 | * which require early EC, but fail to provide ECDT */ | 1014 | * which require early EC, but fail to provide ECDT */ |
1014 | acpi_handle x; | ||
1015 | printk(KERN_DEBUG PREFIX "Look up EC in DSDT\n"); | 1015 | printk(KERN_DEBUG PREFIX "Look up EC in DSDT\n"); |
1016 | status = acpi_get_devices(ec_device_ids[0].id, ec_parse_device, | 1016 | status = acpi_get_devices(ec_device_ids[0].id, ec_parse_device, |
1017 | boot_ec, NULL); | 1017 | boot_ec, NULL); |
@@ -1022,7 +1022,7 @@ int __init acpi_ec_ecdt_probe(void) | |||
1022 | * which needs it, has fake EC._INI method, so use it as flag. | 1022 | * which needs it, has fake EC._INI method, so use it as flag. |
1023 | * Keep boot_ec struct as it will be needed soon. | 1023 | * Keep boot_ec struct as it will be needed soon. |
1024 | */ | 1024 | */ |
1025 | if (ACPI_FAILURE(acpi_get_handle(boot_ec->handle, "_INI", &x))) | 1025 | if (ACPI_FAILURE(acpi_get_handle(boot_ec->handle, "_INI", &dummy))) |
1026 | return -ENODEV; | 1026 | return -ENODEV; |
1027 | install: | 1027 | install: |
1028 | if (!ec_install_handlers(boot_ec)) { | 1028 | if (!ec_install_handlers(boot_ec)) { |