Commit 42565999 authored by Tejun Heo's avatar Tejun Heo

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: default avatarTejun Heo <tj@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
parent 30d65030
...@@ -850,8 +850,8 @@ static void hvsi_flush_output(struct hvsi_struct *hp) ...@@ -850,8 +850,8 @@ static void hvsi_flush_output(struct hvsi_struct *hp)
wait_event_timeout(hp->emptyq, (hp->n_outbuf <= 0), HVSI_TIMEOUT); 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 */ /* 'writer' could still be pending if it didn't see n_outbuf = 0 yet */
cancel_delayed_work(&hp->writer); cancel_delayed_work_sync(&hp->writer);
flush_scheduled_work(); flush_work_sync(&hp->handshaker);
/* /*
* it's also possible that our timeout expired and hvsi_write_worker * it's also possible that our timeout expired and hvsi_write_worker
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment