aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/scan.c
diff options
context:
space:
mode:
authorLin Ming <ming.m.lin@intel.com>2010-12-13 00:36:15 -0500
committerLen Brown <len.brown@intel.com>2011-01-12 04:24:40 -0500
commit3a37898d507794cfc68a092303e02651d3f01308 (patch)
treee3a53e7746a5a69000553814d8f07fa51b99ab45 /drivers/acpi/scan.c
parent3cfd53d53f700a225716294842b1a843326dea21 (diff)
ACPICA: Rename some function and variable names
Some function and variable names are renamed to be consistent with ACPICA code base. acpi_raw_enable_gpe -> acpi_ev_add_gpe_reference acpi_raw_disable_gpe -> acpi_ev_remove_gpe_reference acpi_gpe_can_wake -> acpi_setup_gpe_for_wake acpi_gpe_wakeup -> acpi_set_gpe_wake_mask acpi_update_gpes -> acpi_update_all_gpes acpi_all_gpes_initialized -> acpi_gbl_all_gpes_initialized acpi_handler_info -> acpi_gpe_handler_info ... Signed-off-by: Lin Ming <ming.m.lin@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/scan.c')
-rw-r--r--drivers/acpi/scan.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 29ef505c487..70249b3d293 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -778,7 +778,7 @@ acpi_bus_extract_wakeup_device_power_package(acpi_handle handle,
778 wakeup->resources.handles[i] = element->reference.handle; 778 wakeup->resources.handles[i] = element->reference.handle;
779 } 779 }
780 780
781 acpi_gpe_can_wake(wakeup->gpe_device, wakeup->gpe_number); 781 acpi_setup_gpe_for_wake(wakeup->gpe_device, wakeup->gpe_number);
782 782
783 out: 783 out:
784 kfree(buffer.pointer); 784 kfree(buffer.pointer);
@@ -1467,7 +1467,7 @@ int acpi_bus_start(struct acpi_device *device)
1467 1467
1468 result = acpi_bus_scan(device->handle, &ops, NULL); 1468 result = acpi_bus_scan(device->handle, &ops, NULL);
1469 1469
1470 acpi_update_gpes(); 1470 acpi_update_all_gpes();
1471 1471
1472 return result; 1472 return result;
1473} 1473}
@@ -1584,7 +1584,7 @@ int __init acpi_scan_init(void)
1584 if (result) 1584 if (result)
1585 acpi_device_unregister(acpi_root, ACPI_BUS_REMOVAL_NORMAL); 1585 acpi_device_unregister(acpi_root, ACPI_BUS_REMOVAL_NORMAL);
1586 else 1586 else
1587 acpi_update_gpes(); 1587 acpi_update_all_gpes();
1588 1588
1589 return result; 1589 return result;
1590} 1590}