From: Tejun Heo Date: Fri, 24 Dec 2010 14:59:07 +0000 (+0100) Subject: hvsi: don't use flush_scheduled_work() X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=42565999d1e0b8a0c5b4a0d475c26cf3d567e85e;p=mv-sheeva.git 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 Cc: Benjamin Herrenschmidt Cc: Paul Mackerras --- 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