drm/rockchip: Rename async to nonblock.
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Tue, 26 Apr 2016 14:11:43 +0000 (16:11 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 2 May 2016 14:38:12 +0000 (16:38 +0200)
The async name is deprecated and should be changed to nonblocking.

Cc: Mark Yao <mark.yao@rock-chips.com>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1461679905-30177-11-git-send-email-maarten.lankhorst@linux.intel.com
drivers/gpu/drm/rockchip/rockchip_drm_fb.c

index 3b8f652698f828574c19f624264e816ab1299ee9..8c10163a95bcf3f4d50147948b27965e3e97b8f0 100644 (file)
@@ -276,7 +276,7 @@ void rockchip_drm_atomic_work(struct work_struct *work)
 
 int rockchip_drm_atomic_commit(struct drm_device *dev,
                               struct drm_atomic_state *state,
-                              bool async)
+                              bool nonblock)
 {
        struct rockchip_drm_private *private = dev->dev_private;
        struct rockchip_atomic_commit *commit = &private->commit;
@@ -286,7 +286,7 @@ int rockchip_drm_atomic_commit(struct drm_device *dev,
        if (ret)
                return ret;
 
-       /* serialize outstanding asynchronous commits */
+       /* serialize outstanding nonblocking commits */
        mutex_lock(&commit->lock);
        flush_work(&commit->work);
 
@@ -295,7 +295,7 @@ int rockchip_drm_atomic_commit(struct drm_device *dev,
        commit->dev = dev;
        commit->state = state;
 
-       if (async)
+       if (nonblock)
                schedule_work(&commit->work);
        else
                rockchip_atomic_commit_complete(commit);