forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'acpi-scan' into acpi-cleanup

Browse source 
The following commits depend on the 'acpi-scan' material.
This commit is contained in:
Rafael J. Wysocki 2013-01-29 13:58:34 +01:00
commit 64e94e7e0f
4 changed files with 21 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

8
drivers/acpi/dock.c
View file

@ -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);
}
} }
/** /**

28
drivers/acpi/scan.c
View file

@ -52,6 +52,7 @@ static const struct acpi_device_id acpi_platform_device_ids[] = {
static LIST_HEAD(acpi_device_list); static LIST_HEAD(acpi_device_list);
static LIST_HEAD(acpi_bus_id_list); static LIST_HEAD(acpi_bus_id_list);
static DEFINE_MUTEX(acpi_scan_lock);
DEFINE_MUTEX(acpi_device_lock); DEFINE_MUTEX(acpi_device_lock);
LIST_HEAD(acpi_wakeup_device_list); LIST_HEAD(acpi_wakeup_device_list);
@ -127,13 +128,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 */
@ -1616,19 +1612,22 @@ static acpi_status acpi_bus_device_attach(acpi_handle handle, u32 lvl_not_used,
int acpi_bus_scan(acpi_handle handle) int acpi_bus_scan(acpi_handle handle)
{ {
void *device = NULL; void *device = NULL;
int error = 0;
mutex_lock(&acpi_scan_lock);
if (ACPI_SUCCESS(acpi_bus_check_add(handle, 0, NULL, &device))) if (ACPI_SUCCESS(acpi_bus_check_add(handle, 0, NULL, &device)))
acpi_walk_namespace(ACPI_TYPE_ANY, handle, ACPI_UINT32_MAX, acpi_walk_namespace(ACPI_TYPE_ANY, handle, ACPI_UINT32_MAX,
acpi_bus_check_add, NULL, NULL, &device); acpi_bus_check_add, NULL, NULL, &device);
if (!device) if (!device)
return -ENODEV; error = -ENODEV;
else if (ACPI_SUCCESS(acpi_bus_device_attach(handle, 0, NULL, NULL)))
if (ACPI_SUCCESS(acpi_bus_device_attach(handle, 0, NULL, NULL)))
acpi_walk_namespace(ACPI_TYPE_ANY, handle, ACPI_UINT32_MAX, acpi_walk_namespace(ACPI_TYPE_ANY, handle, ACPI_UINT32_MAX,
acpi_bus_device_attach, NULL, NULL, NULL); acpi_bus_device_attach, NULL, NULL, NULL);
return 0; mutex_unlock(&acpi_scan_lock);
return error;
} }
EXPORT_SYMBOL(acpi_bus_scan); EXPORT_SYMBOL(acpi_bus_scan);
@ -1655,8 +1654,10 @@ 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)
{ {
mutex_lock(&acpi_scan_lock);
/* /*
* Execute acpi_bus_device_detach() as a post-order callback to detach * Execute acpi_bus_device_detach() as a post-order callback to detach
* all ACPI drivers from the device nodes being removed. * all ACPI drivers from the device nodes being removed.
@ -1671,7 +1672,8 @@ 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;
mutex_unlock(&acpi_scan_lock);
} }
EXPORT_SYMBOL_GPL(acpi_bus_trim); EXPORT_SYMBOL_GPL(acpi_bus_trim);

10
drivers/pci/hotplug/acpiphp_glue.c
View file

@ -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)
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)

2
include/acpi/acpi_bus.h
View file

@ -386,7 +386,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);