Merge branch 'acpi-scan' into acpi-cleanup

The following commits depend on the 'acpi-scan' material.

1 files changed, 2 insertions, 6 deletions

diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 420d24fc9388..78648f811049 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -336,13 +336,9 @@ static struct acpi_device * dock_create_acpi_device(acpi_handle handle)
 static void dock_remove_acpi_device(acpi_handle handle)
 {
         struct acpi_device *device;
-        int ret;
 
-        if (!acpi_bus_get_device(handle, &device)) {
-                ret = acpi_bus_trim(device);
-                if (ret)
-                        pr_debug("error removing bus, %x\n", -ret);
-        }
+        if (!acpi_bus_get_device(handle, &device))
+                acpi_bus_trim(device);
 }
 
 /**