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
#include "tape_std.h"
#include "tape_3590.h"
#include "tape_std.h"
#include "tape_3590.h"
+static struct workqueue_struct *tape_3590_wq;
+
/*
* Pointer to debug area.
*/
/*
* Pointer to debug area.
*/
p->device = tape_get_device(device);
p->op = op;
p->device = tape_get_device(device);
p->op = op;
- schedule_work(&p->work);
+ queue_work(tape_3590_wq, &p->work);
static void
tape_3590_cleanup_device(struct tape_device *device)
{
static void
tape_3590_cleanup_device(struct tape_device *device)
{
- flush_scheduled_work();
+ flush_workqueue(tape_3590_wq);
tape_std_unassign(device);
kfree(device->discdata);
tape_std_unassign(device);
kfree(device->discdata);
#endif
DBF_EVENT(3, "3590 init\n");
#endif
DBF_EVENT(3, "3590 init\n");
+
+ tape_3590_wq = alloc_workqueue("tape_3590", 0, 0);
+ if (!tape_3590_wq)
+ return -ENOMEM;
+
/* Register driver for 3590 tapes. */
rc = ccw_driver_register(&tape_3590_driver);
/* Register driver for 3590 tapes. */
rc = ccw_driver_register(&tape_3590_driver);
+ if (rc) {
+ destroy_workqueue(tape_3590_wq);
DBF_EVENT(3, "3590 init failed\n");
DBF_EVENT(3, "3590 init failed\n");
DBF_EVENT(3, "3590 registered\n");
return rc;
}
DBF_EVENT(3, "3590 registered\n");
return rc;
}
tape_3590_exit(void)
{
ccw_driver_unregister(&tape_3590_driver);
tape_3590_exit(void)
{
ccw_driver_unregister(&tape_3590_driver);
+ destroy_workqueue(tape_3590_wq);
debug_unregister(TAPE_DBF_AREA);
}
debug_unregister(TAPE_DBF_AREA);
}
void
tapeblock_cleanup_device(struct tape_device *device)
{
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) {
tape_put_device(device);
if (!device->blk_data.disk) {