vmwgfx: don't use flush_scheduled_work()
authorTejun Heo <tj@kernel.org>
Fri, 24 Dec 2010 14:59:07 +0000 (15:59 +0100)
committerTejun Heo <tj@kernel.org>
Fri, 24 Dec 2010 14:59:07 +0000 (15:59 +0100)
flush_scheduled_work() is deprecated and scheduled to be removed.
Directly flush info->deferred_work on removal instead.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Thomas Hellstrom <thellstrom@vmware.com>
drivers/gpu/drm/vmwgfx/vmwgfx_fb.c

index 41d9a5b..fe096a7 100644 (file)
@@ -659,7 +659,7 @@ int vmw_fb_off(struct vmw_private *vmw_priv)
        par->dirty.active = false;
        spin_unlock_irqrestore(&par->dirty.lock, flags);
 
-       flush_scheduled_work();
+       flush_delayed_work_sync(&info->deferred_work);
 
        par->bo_ptr = NULL;
        ttm_bo_kunmap(&par->map);