drm/ttm: use cancel_delayed_work_sync() in ttm_bo

Make ttm_bo::ttm_bo_device_release call cancel_delayed_work_sync()
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@kernel.org>
Cc:: Thomas Hellstrom <thellstrom@vmware.com>
Cc:: Dave Airlie <airlied@redhat.com>

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index 148a322..934a96a 100644 (file)
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -1472,8 +1472,7 @@ int ttm_bo_device_release(struct ttm_bo_device *bdev)
        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))
                ;