From: Feng Tang Date: Mon, 22 Oct 2012 23:29:49 +0000 (+0200) Subject: ACPI: Remove the useless check in osl.c X-Git-Tag: next-20121024~35^2^2~11 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c84ff6970d6bb311eaaa5f72ae68f0a09c2246be;p=karo-tx-linux.git ACPI: Remove the useless check in osl.c Clean up dpc->work initialization in __acpi_os_execute(). [rjw: Added the changelog.] Signed-off-by: Feng Tang Signed-off-by: Rafael J. Wysocki --- diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 9eaf708f5885..e76a7f59740a 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -949,12 +949,7 @@ static acpi_status __acpi_os_execute(acpi_execute_type type, (type == OSL_NOTIFY_HANDLER ? kacpi_notify_wq : kacpid_wq); dpc->wait = hp ? 1 : 0; - if (queue == kacpi_hotplug_wq) - INIT_WORK(&dpc->work, acpi_os_execute_deferred); - else if (queue == kacpi_notify_wq) - INIT_WORK(&dpc->work, acpi_os_execute_deferred); - else - INIT_WORK(&dpc->work, acpi_os_execute_deferred); + INIT_WORK(&dpc->work, acpi_os_execute_deferred); /* * On some machines, a software-initiated SMI causes corruption unless