]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
sh: don't use flush_scheduled_work()
authorTejun Heo <tj@kernel.org>
Fri, 24 Dec 2010 14:59:06 +0000 (15:59 +0100)
committerTejun Heo <tj@kernel.org>
Fri, 24 Dec 2010 14:59:06 +0000 (15:59 +0100)
flush_scheduled_work() is deprecated and scheduled to be removed.
Directly flush psw->work on removal instead.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: linux-sh@vger.kernel.org
arch/sh/drivers/push-switch.c

index 7b42c247316c56e1e0fc85da723407c041f2097f..afc24556572bdc2863e6a022c1894a86ad8f92ff 100644 (file)
@@ -107,7 +107,7 @@ static int switch_drv_remove(struct platform_device *pdev)
                device_remove_file(&pdev->dev, &dev_attr_switch);
 
        platform_set_drvdata(pdev, NULL);
-       flush_scheduled_work();
+       flush_work_sync(&psw->work);
        del_timer_sync(&psw->debounce);
        free_irq(irq, pdev);