[PATCH 08/14] GPU-DRM-OMAP: Rename a jump label in dmm_txn_commit()
From: SF Markus Elfring <hidden>
Date: 2016-09-21 16:50:02
Also in:
dri-devel, kernel-janitors
Subsystem:
drm drivers, drm drivers and misc gpu patches, drm drivers for ti omap, the rest · Maintainers:
David Airlie, Simona Vetter, Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, Tomi Valkeinen, Linus Torvalds
From: Markus Elfring <redacted> Date: Wed, 21 Sep 2016 17:32:42 +0200 Adjust a jump target so that redundant checks can be avoided at the end. Signed-off-by: Markus Elfring <redacted> --- drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
index 5f6f21b..c8ced158 100644
--- a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
+++ b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c@@ -269,7 +269,7 @@ static int dmm_txn_commit(struct dmm_txn *txn, bool wait) if (!txn->last_pat) { dev_err(engine->dmm->dev, "need at least one txn\n"); ret = -EINVAL; - goto cleanup; + goto release_engine; } txn->last_pat->next_pa = 0;
@@ -281,7 +281,7 @@ static int dmm_txn_commit(struct dmm_txn *txn, bool wait) ret = wait_status(engine, DMM_PATSTATUS_READY); if (ret) { ret = -EFAULT; - goto cleanup; + goto release_engine; } /* mark whether it is async to denote list management in IRQ handler */
@@ -301,9 +301,9 @@ static int dmm_txn_commit(struct dmm_txn *txn, bool wait) } } -cleanup: /* only place engine back on list if we are done with it */ if (ret || wait) + release_engine: release_engine(engine); return ret;
--
2.10.0