浏览代码

drm: omapdrm: gem: Simplify error handling when creating GEM object

The goto error statement end up just returning NULL without performing
any cleanup, replace it with a direct return.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Laurent Pinchart 9 年之前
父节点
当前提交
92b4b44538
共有 1 个文件被更改,包括 3 次插入5 次删除
  1. 3 5
      drivers/gpu/drm/omapdrm/omap_gem.c

+ 3 - 5
drivers/gpu/drm/omapdrm/omap_gem.c

@@ -1352,7 +1352,7 @@ struct drm_gem_object *omap_gem_new(struct drm_device *dev,
 {
 {
 	struct omap_drm_private *priv = dev->dev_private;
 	struct omap_drm_private *priv = dev->dev_private;
 	struct omap_gem_object *omap_obj;
 	struct omap_gem_object *omap_obj;
-	struct drm_gem_object *obj = NULL;
+	struct drm_gem_object *obj;
 	struct address_space *mapping;
 	struct address_space *mapping;
 	size_t size;
 	size_t size;
 	int ret;
 	int ret;
@@ -1360,7 +1360,7 @@ struct drm_gem_object *omap_gem_new(struct drm_device *dev,
 	if (flags & OMAP_BO_TILED) {
 	if (flags & OMAP_BO_TILED) {
 		if (!priv->usergart) {
 		if (!priv->usergart) {
 			dev_err(dev->dev, "Tiled buffers require DMM\n");
 			dev_err(dev->dev, "Tiled buffers require DMM\n");
-			goto fail;
+			return NULL;
 		}
 		}
 
 
 		/* tiled buffers are always shmem paged backed.. when they are
 		/* tiled buffers are always shmem paged backed.. when they are
@@ -1431,9 +1431,7 @@ struct drm_gem_object *omap_gem_new(struct drm_device *dev,
 	return obj;
 	return obj;
 
 
 fail:
 fail:
-	if (obj)
-		omap_gem_free_object(obj);
-
+	omap_gem_free_object(obj);
 	return NULL;
 	return NULL;
 }
 }