ACPI: EC: fix compilation warning
Subsystems (2)
PATCH 1/1 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
--- drivers/acpi/ec.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/acpi/ec.c +2 -2
@@ -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)) {
Signature · 1 line
1.5.6.3
Quoted 2 lines · Hannes Eder
Fix the warning introduced in commit
c5279dee26c0e8d7c4200993bfc4b540d2469598, and give the dummy variable a more verbose name.
Thanks!
Quoted 5 lines
drivers/acpi/ec.c: In function 'acpi_ec_ecdt_probe':
drivers/acpi/ec.c:1015: warning: ISO C90 forbids mixed declarations and codeSigned-off-by Hannes Eder <[email protected]>
Quoted 33 lines
--- drivers/acpi/ec.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)drivers/acpi/ec.c +2
-2@@ -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)) {
Len Brown
reviewerQuoted 4 lines · Alexey Starikovskiy
Quoted 3 lines · Hannes Eder
Fix the warning introduced in commit
c5279dee26c0e8d7c4200993bfc4b540d2469598,
and give the dummy variable a more verbose name.
Quoted 8 lines
Thanks!
Quoted 6 lines
drivers/acpi/ec.c: In function 'acpi_ec_ecdt_probe':
drivers/acpi/ec.c:1015: warning: ISO C90 forbids mixed declarations and
codeSigned-off-by Hannes Eder <[email protected]>
applied on top of 11880 fix in acpi-test.
thanks,
-len