sonypi: don't use flush_scheduled_work()
authorTejun Heo <tj@kernel.org>
Fri, 24 Dec 2010 14:59:07 +0000 (15:59 +0100)
committerTejun Heo <tj@kernel.org>
Fri, 24 Dec 2010 14:59:07 +0000 (15:59 +0100)
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>
drivers/char/sonypi.c

index 73f66d0..79e36c8 100644 (file)
@@ -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);