leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ACPI: simplify deferred execution path

Browse Source 
We had two functions, acpi_os_execute_deferred() and
acpi_os_execute_hp_deferred() that differed only in that the
latter did acpi_os_wait_events_complete(NULL) before executing
the deferred function.

This patch consolidates those two functions and uses a flag in
the struct acpi_os_dpc to determine whether to do the wait.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Bjorn Helgaas 2009-08-31 22:32:10 +00:00 committed by Len Brown
parent d26f0528d5
commit 9ac6185669
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/acpi/osl.c
View File

@ -58,6 +58,7 @@ struct acpi_os_dpc {
acpi_osd_exec_callback function; acpi_osd_exec_callback function;
void *context; void *context;
struct work_struct work; struct work_struct work;
int wait;
}; };
#ifdef CONFIG_ACPI_CUSTOM_DSDT #ifdef CONFIG_ACPI_CUSTOM_DSDT
@ -703,21 +704,8 @@ static void acpi_os_execute_deferred(struct work_struct *work)
return; return;
} }
dpc->function(dpc->context); if (dpc->wait)
kfree(dpc); acpi_os_wait_events_complete(NULL);
return;
}
static void acpi_os_execute_hp_deferred(struct work_struct *work)
{
struct acpi_os_dpc *dpc = container_of(work, struct acpi_os_dpc, work);
if (!dpc) {
printk(KERN_ERR PREFIX "Invalid (NULL) context\n");
return;
}
acpi_os_wait_events_complete(NULL);
dpc->function(dpc->context); dpc->function(dpc->context);
kfree(dpc); kfree(dpc);
@ -746,7 +734,6 @@ static acpi_status __acpi_os_execute(acpi_execute_type type,
acpi_status status = AE_OK; acpi_status status = AE_OK;
struct acpi_os_dpc *dpc; struct acpi_os_dpc *dpc;
struct workqueue_struct *queue; struct workqueue_struct *queue;
work_func_t func;
int ret; int ret;
ACPI_DEBUG_PRINT((ACPI_DB_EXEC, ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
"Scheduling function [%p(%p)] for deferred execution.\n", "Scheduling function [%p(%p)] for deferred execution.\n",
@ -779,8 +766,8 @@ static acpi_status __acpi_os_execute(acpi_execute_type type,
*/ */
queue = hp ? kacpi_hotplug_wq : queue = hp ? kacpi_hotplug_wq :
(type == OSL_NOTIFY_HANDLER ? kacpi_notify_wq : kacpid_wq); (type == OSL_NOTIFY_HANDLER ? kacpi_notify_wq : kacpid_wq);
func = hp ? acpi_os_execute_hp_deferred : acpi_os_execute_deferred; dpc->wait = hp ? 1 : 0;
INIT_WORK(&dpc->work, func); INIT_WORK(&dpc->work, acpi_os_execute_deferred);
ret = queue_work(queue, &dpc->work); ret = queue_work(queue, &dpc->work);
if (!ret) { if (!ret) {