diff mbox

[3/4] ACPI: Remove the useless check in osl.c

Message ID 1351561961-23821-3-git-send-email-feng.tang@intel.com (mailing list archive)
State Rejected, archived
Headers show

Commit Message

Feng Tang Oct. 30, 2012, 1:52 a.m. UTC 
Signed-off-by: Feng Tang <feng.tang@intel.com>
---
 drivers/acpi/osl.c |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

Comments

Rafael Wysocki Nov. 2, 2012, 12:49 p.m. UTC | #1 
On Tuesday, October 30, 2012 09:52:40 AM Feng Tang wrote:
> Signed-off-by: Feng Tang <feng.tang@intel.com>
> ---
>  drivers/acpi/osl.c |    7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
> index 9eaf708..e76a7f5 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

The check is not really useless, because it prevents lockdep from
complaining unnecessarily.

I have applied a different patch to document this.

Thanks,
Rafael
diff mbox

Patch

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 9eaf708..e76a7f5 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