From: Maarten Lankhorst Date: Tue, 26 Apr 2016 14:11:41 +0000 (+0200) Subject: drm/sti: Rename async to nonblock. X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ab575184254c113fa1a8e8653619ec2f08747bbd;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git drm/sti: Rename async to nonblock. The async name is deprecated and should be changed to nonblocking. Cc: Benjamin Gaignard Cc: Vincent Abriou Signed-off-by: Maarten Lankhorst Acked-by: Vincent Abriou Signed-off-by: Daniel Vetter Link: http://patchwork.freedesktop.org/patch/msgid/1461679905-30177-9-git-send-email-maarten.lankhorst@linux.intel.com --- diff --git a/drivers/gpu/drm/sti/sti_drv.c b/drivers/gpu/drm/sti/sti_drv.c index 6bd6abaa5a70..872495e72294 100644 --- a/drivers/gpu/drm/sti/sti_drv.c +++ b/drivers/gpu/drm/sti/sti_drv.c @@ -202,7 +202,7 @@ static void sti_atomic_work(struct work_struct *work) } static int sti_atomic_commit(struct drm_device *drm, - struct drm_atomic_state *state, bool async) + struct drm_atomic_state *state, bool nonblock) { struct sti_private *private = drm->dev_private; int err; @@ -211,7 +211,7 @@ static int sti_atomic_commit(struct drm_device *drm, if (err) return err; - /* serialize outstanding asynchronous commits */ + /* serialize outstanding nonblocking commits */ mutex_lock(&private->commit.lock); flush_work(&private->commit.work); @@ -223,7 +223,7 @@ static int sti_atomic_commit(struct drm_device *drm, drm_atomic_helper_swap_state(drm, state); - if (async) + if (nonblock) sti_atomic_schedule(private, state); else sti_atomic_complete(private, state);