commit 0ead5c86ac4c9903da93c76716135bc29d9cd83b
author Tejun Heo <tj@kernel.org> Fri Dec 24 15:59:06 2010 +0100
committer Tejun Heo <tj@kernel.org> Fri Dec 24 15:59:06 2010 +0100
tree ecb9ec44366c17a77e2c0cb20e75574e5e1b8b29
parent 8aa0f413848708bca329c52358ae7a1a0e395b4e

gdrom: don't use flush_scheduled_work()

flush_scheduled_work() is deprecated and scheduled to be removed.
Directly flush work on removal instead.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Jens Axboe <axboe@kernel.dk>

drivers/cdrom/gdrom.c

diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
index de65915..64a2146 100644
--- a/drivers/cdrom/gdrom.c
+++ b/drivers/cdrom/gdrom.c
@@ -837,7 +837,7 @@
 
 static int __devexit remove_gdrom(struct platform_device *devptr)
 {
-	flush_scheduled_work();
+	flush_work_sync(&work);
 	blk_cleanup_queue(gd.gdrom_rq);
 	free_irq(HW_EVENT_GDROM_CMD, &gd);
 	free_irq(HW_EVENT_GDROM_DMA, &gd);