From: Maarten Lankhorst Date: Tue, 26 Apr 2016 14:11:39 +0000 (+0200) Subject: drm/omapdrm: Rename async to nonblock. X-Git-Tag: v4.7-rc1~77^2~30^2~34 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6fc17fb21e527d61f1a1e1834241ee3dc10db865;p=karo-tx-linux.git drm/omapdrm: Rename async to nonblock. The async name is deprecated and should be changed to nonblocking. Cc: Tomi Valkeinen Signed-off-by: Maarten Lankhorst Signed-off-by: Daniel Vetter Link: http://patchwork.freedesktop.org/patch/msgid/1461679905-30177-7-git-send-email-maarten.lankhorst@linux.intel.com --- diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c index 80398a684cae..fe794980f1c8 100644 --- a/drivers/gpu/drm/omapdrm/omap_drv.c +++ b/drivers/gpu/drm/omapdrm/omap_drv.c @@ -138,7 +138,7 @@ static bool omap_atomic_is_pending(struct omap_drm_private *priv, } static int omap_atomic_commit(struct drm_device *dev, - struct drm_atomic_state *state, bool async) + struct drm_atomic_state *state, bool nonblock) { struct omap_drm_private *priv = dev->dev_private; struct omap_atomic_state_commit *commit; @@ -177,7 +177,7 @@ static int omap_atomic_commit(struct drm_device *dev, /* Swap the state, this is the point of no return. */ drm_atomic_helper_swap_state(dev, state); - if (async) + if (nonblock) schedule_work(&commit->work); else omap_atomic_complete(commit);