summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/dock.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-01-19 01:27:35 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-01-19 01:27:35 +0100
commitb8bd759acd05281abf88cddef30c57313c109697 (patch)
tree9ccbf63ea93bd2c41b8060987b8e670176090cbf /drivers/acpi/dock.c
parent5993c4670ea2453ef5abb45b312f150e994e6eb9 (diff)
downloadlinux-b8bd759acd05281abf88cddef30c57313c109697.tar.bz2
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 'drivers/acpi/dock.c')
-rw-r--r--drivers/acpi/dock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 4a56a8b2e51e..420d24fc9388 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -317,7 +317,7 @@ static struct acpi_device * dock_create_acpi_device(acpi_handle handle)
* no device created for this object,
* so we should create one.
*/
- ret = acpi_bus_add(handle);
+ ret = acpi_bus_scan(handle);
if (ret)
pr_debug("error adding bus, %x\n", -ret);