summaryrefslogtreecommitdiff
path: root/arch/sh/drivers
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2010-12-24 17:59:06 +0300
committerTejun Heo <tj@kernel.org>2010-12-24 17:59:06 +0300
commit539253f6e13feedfa7bb6a3112c6707ebdf11e74 (patch)
treeae250ff09f76f581ca49ab7eee0b06138be9db6f /arch/sh/drivers
parentfe413ec322e26179c788c678f24434b94cca34f0 (diff)
downloadlinux-539253f6e13feedfa7bb6a3112c6707ebdf11e74.tar.xz
sh: don't use flush_scheduled_work()
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
Diffstat (limited to 'arch/sh/drivers')
-rw-r--r--arch/sh/drivers/push-switch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/drivers/push-switch.c b/arch/sh/drivers/push-switch.c
index 7b42c247316c..afc24556572b 100644
--- a/arch/sh/drivers/push-switch.c
+++ b/arch/sh/drivers/push-switch.c
@@ -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);