From: Tejun Heo <tj@kernel.org>
Date: Fri, 24 Dec 2010 14:59:07 +0000 (+0100)
Subject: sonypi: don't use flush_scheduled_work()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3514870f06a7907bc46361aebc3daf5ea4e97eeb;p=linux-beck.git

sonypi: don't use flush_scheduled_work()

flush_scheduled_work() is deprecated and scheduled to be removed.
Directly flush sonypi_device.input_work on removal instead.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Mattia Dongili <malattia@linux.it>
---

diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index 73f66d03624d..79e36c878a4c 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -1434,7 +1434,7 @@ static int __devexit sonypi_remove(struct platform_device *dev)
 	sonypi_disable();
 
 	synchronize_irq(sonypi_device.irq);
-	flush_scheduled_work();
+	flush_work_sync(&sonypi_device.input_work);
 
 	if (useinput) {
 		input_unregister_device(sonypi_device.input_key_dev);