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 <[email protected]>
Signed-off-by: Tomi Valkeinen <[email protected]>

diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c
index c215feccf0923f87c574e7d018f9620959e83dee..a589685ec63ddbec80f1fcc8d5d730536165a577 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_gem.c
+++ b/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_gem_object *omap_obj;
-       struct drm_gem_object *obj = NULL;
+       struct drm_gem_object *obj;
        struct address_space *mapping;
        size_t size;
        int ret;
@@ -1360,7 +1360,7 @@ struct drm_gem_object *omap_gem_new(struct drm_device *dev,
        if (flags & OMAP_BO_TILED) {
                if (!priv->usergart) {
                        dev_err(dev->dev, "Tiled buffers require DMM\n");
-                       goto fail;
+                       return NULL;
                }
 
                /* 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;
 
 fail:
-       if (obj)
-               omap_gem_free_object(obj);
-
+       omap_gem_free_object(obj);
        return NULL;
 }