aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2010-12-24 15:59:07 +0100
committerTejun Heo <tj@kernel.org>2010-12-24 15:59:07 +0100
commit42565999d1e0b8a0c5b4a0d475c26cf3d567e85e (patch)
treef4c5e7a670661328272ecf11c5cb1af0c16a767d /drivers
parent30d65030fd14fd3696d927c5e452bee84c589b09 (diff)
hvsi: don't use flush_scheduled_work()
flush_scheduled_work() is deprecated and scheduled to be removed. Directly cancel hp->writer and flush hp->handshaker instead. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/hvsi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/hvsi.c b/drivers/char/hvsi.c
index a2bc885ce60..67a75a502c0 100644
--- a/drivers/char/hvsi.c
+++ b/drivers/char/hvsi.c
@@ -850,8 +850,8 @@ static void hvsi_flush_output(struct hvsi_struct *hp)
wait_event_timeout(hp->emptyq, (hp->n_outbuf <= 0), HVSI_TIMEOUT);
/* 'writer' could still be pending if it didn't see n_outbuf = 0 yet */
- cancel_delayed_work(&hp->writer);
- flush_scheduled_work();
+ cancel_delayed_work_sync(&hp->writer);
+ flush_work_sync(&hp->handshaker);
/*
* it's also possible that our timeout expired and hvsi_write_worker