diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-25 18:27:44 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-25 18:27:44 -0500 |
commit | bfee26dba0f373ebe4e6f0b293d078b02f9f7f69 (patch) | |
tree | c16763220b2ade3bdfd24b874eedea51a3f66384 /drivers/acpi/dock.c | |
parent | b8bd759acd05281abf88cddef30c57313c109697 (diff) |
ACPI / scan: Make it clear that acpi_bus_trim() cannot fail
Since acpi_bus_trim() cannot fail, change its definition to a void
function, so that its callers don't check the return value in vain
and update the callers.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Yinghai Lu <yinghai@kernel.org>
Acked-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Acked-by: Toshi Kani <toshi.kani@hp.com>
Diffstat (limited to 'drivers/acpi/dock.c')
-rw-r--r-- | drivers/acpi/dock.c | 8 |
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) | |||
336 | static void dock_remove_acpi_device(acpi_handle handle) | 336 | static void dock_remove_acpi_device(acpi_handle handle) |
337 | { | 337 | { |
338 | struct acpi_device *device; | 338 | struct acpi_device *device; |
339 | int ret; | ||
340 | 339 | ||
341 | if (!acpi_bus_get_device(handle, &device)) { | 340 | if (!acpi_bus_get_device(handle, &device)) |
342 | ret = acpi_bus_trim(device); | 341 | acpi_bus_trim(device); |
343 | if (ret) | ||
344 | pr_debug("error removing bus, %x\n", -ret); | ||
345 | } | ||
346 | } | 342 | } |
347 | 343 | ||
348 | /** | 344 | /** |