summaryrefslogtreecommitdiffstats
path: root/drivers/s390/char/tape_block.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2010-12-24 16:00:18 +0100
committerTejun Heo <tj@kernel.org>2010-12-24 16:00:18 +0100
commit6dca467a76bb0ed71d65143b235e0ef80e44436f (patch)
treeb74b8643fd8a2e20268a96584257b27ed9d1a999 /drivers/s390/char/tape_block.c
parentrtc: don't use flush_scheduled_work() (diff)
downloadlinux-6dca467a76bb0ed71d65143b235e0ef80e44436f.tar.xz
linux-6dca467a76bb0ed71d65143b235e0ef80e44436f.zip
s390: don't use flush_scheduled_work()
flush_scheduled_work() is deprecated and scheduled to be removed. * tape_3590: Create and use tape_3590_wq instead of the system_wq. * tape_block: Directly flush requeue_task on cleanup instead of using flush_scheduled_work(). Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: linux390@de.ibm.com Cc: linux-s390@vger.kernel.org
Diffstat (limited to 'drivers/s390/char/tape_block.c')
-rw-r--r--drivers/s390/char/tape_block.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/char/tape_block.c b/drivers/s390/char/tape_block.c
index f0fa9ca5cb2c..55d2d0f4eabc 100644
--- a/drivers/s390/char/tape_block.c
+++ b/drivers/s390/char/tape_block.c
@@ -264,7 +264,7 @@ cleanup_queue:
void
tapeblock_cleanup_device(struct tape_device *device)
{
- flush_scheduled_work();
+ flush_work_sync(&device->blk_data.requeue_task);
tape_put_device(device);
if (!device->blk_data.disk) {