}
 
 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;
        if (err)
                return err;
 
-       /* serialize outstanding asynchronous commits */
+       /* serialize outstanding nonblocking commits */
        mutex_lock(&tegra->commit.lock);
        flush_work(&tegra->commit.work);
 
 
        drm_atomic_helper_swap_state(drm, state);
 
-       if (async)
+       if (nonblock)
                tegra_atomic_schedule(tegra, state);
        else
                tegra_atomic_complete(tegra, state);