summaryrefslogtreecommitdiff
path: root/drivers/acpi/dock.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-01-15 13:23:53 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-01-15 13:23:53 +0100
commitae281795ec92d35dd1631401829124acab965b1f (patch)
treefbe1444521184eef3927aa0a8bb13e1da4356a9a /drivers/acpi/dock.c
parentb17b537ac1429a609addb55bf985f5ebfcf4ae7b (diff)
downloadkernel-common-ae281795ec92d35dd1631401829124acab965b1f.tar.gz
kernel-common-ae281795ec92d35dd1631401829124acab965b1f.tar.bz2
kernel-common-ae281795ec92d35dd1631401829124acab965b1f.zip
ACPI / scan: Drop the second argument of acpi_bus_trim()
All callers of acpi_bus_trim() pass 1 (true) as the second argument of it, so remove that argument entirely and change acpi_bus_trim() to always behave as though it were 1. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Acked-by: Toshi Kani <toshi.kani@hp.com> Acked-by: Yinghai Lu <yinghai@kernel.org> Acked-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
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 9e31b2bd93d3..4a56a8b2e51e 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -339,7 +339,7 @@ static void dock_remove_acpi_device(acpi_handle handle)
int ret;
if (!acpi_bus_get_device(handle, &device)) {
- ret = acpi_bus_trim(device, 1);
+ ret = acpi_bus_trim(device);
if (ret)
pr_debug("error removing bus, %x\n", -ret);
}