projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8aa0f41
)
gdrom: don't use flush_scheduled_work()
author
Tejun Heo
<tj@kernel.org>
Fri, 24 Dec 2010 14:59:06 +0000
(15:59 +0100)
committer
Tejun Heo
<tj@kernel.org>
Fri, 24 Dec 2010 14:59:06 +0000
(15:59 +0100)
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
patch
|
blob
|
history
diff --git
a/drivers/cdrom/gdrom.c
b/drivers/cdrom/gdrom.c
index
de65915
..
64a2146
100644
(file)
--- a/
drivers/cdrom/gdrom.c
+++ b/
drivers/cdrom/gdrom.c
@@
-837,7
+837,7
@@
probe_fail_no_mem:
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);