diff options
| author | Tejun Heo <tj@kernel.org> | 2010-12-24 15:59:06 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-12-24 15:59:06 +0100 |
| commit | 539253f6e13feedfa7bb6a3112c6707ebdf11e74 (patch) | |
| tree | ae250ff09f76f581ca49ab7eee0b06138be9db6f /arch/sh | |
| parent | fe413ec322e26179c788c678f24434b94cca34f0 (diff) | |
| download | blackbird-op-linux-539253f6e13feedfa7bb6a3112c6707ebdf11e74.tar.gz blackbird-op-linux-539253f6e13feedfa7bb6a3112c6707ebdf11e74.zip | |
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')
| -rw-r--r-- | arch/sh/drivers/push-switch.c | 2 |
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); |
