From: Maarten Lankhorst Date: Tue, 26 Apr 2016 14:11:42 +0000 (+0200) Subject: drm/tegra: Rename async to nonblock. X-Git-Tag: MMI-PSA29.97-13-9~7857^2~30^2~31 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2dacdd70a7f366e30d197b059bbfbf3d05efc831;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git drm/tegra: Rename async to nonblock. The async name is deprecated and should be changed to nonblocking. Cc: Thierry Reding Cc: "Terje Bergström" Signed-off-by: Maarten Lankhorst Signed-off-by: Daniel Vetter Link: http://patchwork.freedesktop.org/patch/msgid/1461679905-30177-10-git-send-email-maarten.lankhorst@linux.intel.com --- diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c index 2be88eb0cb83..71a52f4e688b 100644 --- a/drivers/gpu/drm/tegra/drm.c +++ b/drivers/gpu/drm/tegra/drm.c @@ -74,7 +74,7 @@ static void tegra_atomic_work(struct work_struct *work) } static int tegra_atomic_commit(struct drm_device *drm, - struct drm_atomic_state *state, bool async) + struct drm_atomic_state *state, bool nonblock) { struct tegra_drm *tegra = drm->dev_private; int err; @@ -83,7 +83,7 @@ static int tegra_atomic_commit(struct drm_device *drm, if (err) return err; - /* serialize outstanding asynchronous commits */ + /* serialize outstanding nonblocking commits */ mutex_lock(&tegra->commit.lock); flush_work(&tegra->commit.work); @@ -95,7 +95,7 @@ static int tegra_atomic_commit(struct drm_device *drm, drm_atomic_helper_swap_state(drm, state); - if (async) + if (nonblock) tegra_atomic_schedule(tegra, state); else tegra_atomic_complete(tegra, state);