diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-18 19:27:35 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-18 19:27:35 -0500 |
commit | b8bd759acd05281abf88cddef30c57313c109697 (patch) | |
tree | 9ccbf63ea93bd2c41b8060987b8e670176090cbf /include/acpi | |
parent | 5993c4670ea2453ef5abb45b312f150e994e6eb9 (diff) |
ACPI / scan: Drop acpi_bus_add() and use acpi_bus_scan() instead
The only difference between acpi_bus_scan() and acpi_bus_add() is the
invocation of acpi_update_all_gpes() in the latter which in fact is
unnecessary, because acpi_update_all_gpes() has already been called
by acpi_scan_init() and the way it is implemented guarantees the next
invocations of it to do nothing.
For this reason, drop acpi_bus_add() and make all its callers use
acpi_bus_scan() directly instead of it. Additionally, rearrange the
code in acpi_scan_init() slightly to improve the visibility of the
acpi_update_all_gpes() call in there.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Yinghai Lu <yinghai@kernel.org>
Diffstat (limited to 'include/acpi')
-rw-r--r-- | include/acpi/acpi_bus.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 567851b4f043..2c722deb2490 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h | |||
@@ -346,7 +346,7 @@ static inline int acpi_bus_generate_proc_event(struct acpi_device *device, u8 ty | |||
346 | #endif | 346 | #endif |
347 | int acpi_bus_register_driver(struct acpi_driver *driver); | 347 | int acpi_bus_register_driver(struct acpi_driver *driver); |
348 | void acpi_bus_unregister_driver(struct acpi_driver *driver); | 348 | void acpi_bus_unregister_driver(struct acpi_driver *driver); |
349 | int acpi_bus_add(acpi_handle handle); | 349 | int acpi_bus_scan(acpi_handle handle); |
350 | void acpi_bus_hot_remove_device(void *context); | 350 | void acpi_bus_hot_remove_device(void *context); |
351 | int acpi_bus_trim(struct acpi_device *start); | 351 | int acpi_bus_trim(struct acpi_device *start); |
352 | acpi_status acpi_bus_get_ejd(acpi_handle handle, acpi_handle * ejd); | 352 | acpi_status acpi_bus_get_ejd(acpi_handle handle, acpi_handle * ejd); |