Make ttm_bo::ttm_bo_device_release call cancel_delayed_work_sync()Acked-by: Thomas Hellstrom <thellstrom@xxxxxxxxxx>
instead of calling cancel_delayed_work() followed by
flush_scheduled_work().
This is to prepare for the deprecation and removal of
flush_scheduled_work().
Signed-off-by: Tejun Heo<tj@xxxxxxxxxx>
---
drivers/gpu/drm/ttm/ttm_bo.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
Index: work/drivers/gpu/drm/ttm/ttm_bo.c
===================================================================
--- work.orig/drivers/gpu/drm/ttm/ttm_bo.c
+++ work/drivers/gpu/drm/ttm/ttm_bo.c
@@ -1480,8 +1480,7 @@ int ttm_bo_device_release(struct ttm_bo_
list_del(&bdev->device_list);
mutex_unlock(&glob->device_list_mutex);
- if (!cancel_delayed_work(&bdev->wq))
- flush_scheduled_work();
+ cancel_delayed_work_sync(&bdev->wq);
while (ttm_bo_delayed_delete(bdev, true))
;