Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42565999 authored by Tejun Heo's avatar Tejun Heo
Browse files

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

drivers/char/hvsi.c

+2 −2
Original line number Diff line number Diff line
@@ -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