[PATCH v2.6.36-rc7] drm/ttm: use cancel_delayed_work_sync() in ttm_bo

[Tejun Heo]

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@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))
 		;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/