Commit bfee26db authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

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: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarYinghai Lu <yinghai@kernel.org>
Acked-by: default avatarYasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Acked-by: default avatarToshi Kani <toshi.kani@hp.com>
parent b8bd759a
...@@ -336,13 +336,9 @@ static struct acpi_device * dock_create_acpi_device(acpi_handle handle) ...@@ -336,13 +336,9 @@ static struct acpi_device * dock_create_acpi_device(acpi_handle handle)
static void dock_remove_acpi_device(acpi_handle handle) static void dock_remove_acpi_device(acpi_handle handle)
{ {
struct acpi_device *device; struct acpi_device *device;
int ret;
if (!acpi_bus_get_device(handle, &device)) { if (!acpi_bus_get_device(handle, &device))
ret = acpi_bus_trim(device); acpi_bus_trim(device);
if (ret)
pr_debug("error removing bus, %x\n", -ret);
}
} }
/** /**
......
...@@ -127,13 +127,8 @@ void acpi_bus_hot_remove_device(void *context) ...@@ -127,13 +127,8 @@ void acpi_bus_hot_remove_device(void *context)
ACPI_DEBUG_PRINT((ACPI_DB_INFO, ACPI_DEBUG_PRINT((ACPI_DB_INFO,
"Hot-removing device %s...\n", dev_name(&device->dev))); "Hot-removing device %s...\n", dev_name(&device->dev)));
if (acpi_bus_trim(device)) { acpi_bus_trim(device);
printk(KERN_ERR PREFIX /* Device node has been released. */
"Removing device failed\n");
goto err_out;
}
/* device has been freed */
device = NULL; device = NULL;
/* power off device */ /* power off device */
...@@ -1631,7 +1626,7 @@ static acpi_status acpi_bus_remove(acpi_handle handle, u32 lvl_not_used, ...@@ -1631,7 +1626,7 @@ static acpi_status acpi_bus_remove(acpi_handle handle, u32 lvl_not_used,
return AE_OK; return AE_OK;
} }
int acpi_bus_trim(struct acpi_device *start) void acpi_bus_trim(struct acpi_device *start)
{ {
/* /*
* Execute acpi_bus_device_detach() as a post-order callback to detach * Execute acpi_bus_device_detach() as a post-order callback to detach
...@@ -1647,7 +1642,6 @@ int acpi_bus_trim(struct acpi_device *start) ...@@ -1647,7 +1642,6 @@ int acpi_bus_trim(struct acpi_device *start)
acpi_walk_namespace(ACPI_TYPE_ANY, start->handle, ACPI_UINT32_MAX, NULL, acpi_walk_namespace(ACPI_TYPE_ANY, start->handle, ACPI_UINT32_MAX, NULL,
acpi_bus_remove, NULL, NULL); acpi_bus_remove, NULL, NULL);
acpi_bus_remove(start->handle, 0, NULL, NULL); acpi_bus_remove(start->handle, 0, NULL, NULL);
return 0;
} }
EXPORT_SYMBOL_GPL(acpi_bus_trim); EXPORT_SYMBOL_GPL(acpi_bus_trim);
......
...@@ -742,8 +742,7 @@ static int acpiphp_bus_add(struct acpiphp_func *func) ...@@ -742,8 +742,7 @@ static int acpiphp_bus_add(struct acpiphp_func *func)
/* this shouldn't be in here, so remove /* this shouldn't be in here, so remove
* the bus then re-add it... * the bus then re-add it...
*/ */
ret_val = acpi_bus_trim(device); acpi_bus_trim(device);
dbg("acpi_bus_trim return %x\n", ret_val);
} }
ret_val = acpi_bus_scan(func->handle); ret_val = acpi_bus_scan(func->handle);
...@@ -772,11 +771,8 @@ static int acpiphp_bus_trim(acpi_handle handle) ...@@ -772,11 +771,8 @@ static int acpiphp_bus_trim(acpi_handle handle)
return retval; return retval;
} }
retval = acpi_bus_trim(device); acpi_bus_trim(device);
if (retval) return 0;
err("cannot remove from acpi list\n");
return retval;
} }
static void acpiphp_set_acpi_region(struct acpiphp_slot *slot) static void acpiphp_set_acpi_region(struct acpiphp_slot *slot)
......
...@@ -348,7 +348,7 @@ int acpi_bus_register_driver(struct acpi_driver *driver); ...@@ -348,7 +348,7 @@ int acpi_bus_register_driver(struct acpi_driver *driver);
void acpi_bus_unregister_driver(struct acpi_driver *driver); void acpi_bus_unregister_driver(struct acpi_driver *driver);
int acpi_bus_scan(acpi_handle handle); int acpi_bus_scan(acpi_handle handle);
void acpi_bus_hot_remove_device(void *context); void acpi_bus_hot_remove_device(void *context);
int acpi_bus_trim(struct acpi_device *start); void acpi_bus_trim(struct acpi_device *start);
acpi_status acpi_bus_get_ejd(acpi_handle handle, acpi_handle * ejd); acpi_status acpi_bus_get_ejd(acpi_handle handle, acpi_handle * ejd);
int acpi_match_device_ids(struct acpi_device *device, int acpi_match_device_ids(struct acpi_device *device,
const struct acpi_device_id *ids); const struct acpi_device_id *ids);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment