[PATCH 08/17] drm/tegra: gem: Cleanup tegra_bo_create_with_handle()

[Thierry Reding]

From: Thierry Reding <tred...@nvidia.com>

There is only a single location where the function needs to do cleanup.
Skip the error unwinding path and call the cleanup function directly
instead.

Signed-off-by: Thierry Reding <treding at nvidia.com>
---
 drivers/gpu/drm/tegra/gem.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c
index 75f95e47bff1..db82c15abc16 100644
--- a/drivers/gpu/drm/tegra/gem.c
+++ b/drivers/gpu/drm/tegra/gem.c
@@ -170,23 +170,21 @@ struct tegra_bo *tegra_bo_create_with_handle(struct 
drm_file *file,
                                             unsigned int *handle)
 {
        struct tegra_bo *bo;
-       int ret;
+       int err;

        bo = tegra_bo_create(drm, size, flags);
        if (IS_ERR(bo))
                return bo;

-       ret = drm_gem_handle_create(file, &bo->gem, handle);
-       if (ret)
-               goto err;
+       err = drm_gem_handle_create(file, &bo->gem, handle);
+       if (err) {
+               tegra_bo_free_object(&bo->gem);
+               return ERR_PTR(err);
+       }

        drm_gem_object_unreference_unlocked(&bo->gem);

        return bo;
-
-err:
-       tegra_bo_free_object(&bo->gem);
-       return ERR_PTR(ret);
 }

 static struct tegra_bo *tegra_bo_import(struct drm_device *drm,
-- 
2.1.2