diff options
| author | Tejun Heo <tj@kernel.org> | 2010-12-24 15:59:06 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-12-24 15:59:06 +0100 |
| commit | f094cfc6c382cec7b2c77dd7798576684153acbb (patch) | |
| tree | ad64b194f52302e7db6941769d19211340570c1c /drivers/gpu/drm/ttm | |
| parent | 404437efc713b6c6fc8e2dc02978624bf4586e2d (diff) | |
| download | linux-3.10-f094cfc6c382cec7b2c77dd7798576684153acbb.tar.gz linux-3.10-f094cfc6c382cec7b2c77dd7798576684153acbb.tar.bz2 linux-3.10-f094cfc6c382cec7b2c77dd7798576684153acbb.zip | |
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>
Diffstat (limited to 'drivers/gpu/drm/ttm')
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_bo.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 148a322d8f5..934a96a7854 100644 --- 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)) ; |