drm/exynos: remove duplicated error routine and unnecessary assign

There were duplicated error handling routines during allocating
pages in lowlevel_buffer_allocate() and g2d_userptr_get_dma_addr().
Also unnecessary NULL assignments for variable used not any more
are removed from g2d_userptr_get_dma_addr() and
g2d_userptr_put_dma_addr().

Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Signed-off-by: YoungJun Cho <yj44.cho@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>

diff --git a/drivers/gpu/drm/exynos/exynos_drm_buf.c b/drivers/gpu/drm/exynos/exynos_drm_buf.c
index 518b6d8e062bfabf564e20d0d4ad05e50ef98277..b8ac06d92fbff74cb66141eaf1a2d148689d6400 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_buf.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_buf.c
@@ -68,8 +68,8 @@ static int lowlevel_buffer_allocate(struct drm_device *dev,
                                        &buf->dma_attrs);
                if (!buf->kvaddr) {
                        DRM_ERROR("failed to allocate buffer.\n");
-                       drm_free_large(buf->pages);
-                       return -ENOMEM;
+                       ret = -ENOMEM;
+                       goto err_free;
                }
 
                start_addr = buf->dma_addr;
@@ -106,7 +106,7 @@ err_free_attrs:
        dma_free_attrs(dev->dev, buf->size, buf->pages,
                        (dma_addr_t)buf->dma_addr, &buf->dma_attrs);
        buf->dma_addr = (dma_addr_t)NULL;
-
+err_free:
        if (!is_drm_iommu_supported(dev))
                drm_free_large(buf->pages);
 

diff --git a/drivers/gpu/drm/exynos/exynos_drm_g2d.c b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
index fb19ee53ecbb5099af18cddc17ef535005bc6318..42a5a5466075a7d2d25b8ab30fa6155383a0befa 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_g2d.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
@@ -388,12 +388,9 @@ out:
 
        sg_free_table(g2d_userptr->sgt);
        kfree(g2d_userptr->sgt);
-       g2d_userptr->sgt = NULL;
 
        drm_free_large(g2d_userptr->pages);
-       g2d_userptr->pages = NULL;
        kfree(g2d_userptr);
-       g2d_userptr = NULL;
 }
 
 static dma_addr_t *g2d_userptr_get_dma_addr(struct drm_device *drm_dev,
@@ -466,8 +463,8 @@ static dma_addr_t *g2d_userptr_get_dma_addr(struct drm_device *drm_dev,
        pages = drm_calloc_large(npages, sizeof(struct page *));
        if (!pages) {
                DRM_ERROR("failed to allocate pages.\n");
-               kfree(g2d_userptr);
-               return ERR_PTR(-ENOMEM);
+               ret = -ENOMEM;
+               goto err_free;
        }
 
        vma = find_vma(current->mm, userptr);
@@ -543,7 +540,6 @@ err_sg_free_table:
 
 err_free_sgt:
        kfree(sgt);
-       sgt = NULL;
 
 err_free_userptr:
        exynos_gem_put_pages_to_userptr(g2d_userptr->pages,
@@ -555,9 +551,9 @@ err_put_vma:
 
 err_free_pages:
        drm_free_large(pages);
+
+err_free:
        kfree(g2d_userptr);
-       pages = NULL;
-       g2d_userptr = NULL;
 
        return ERR_PTR(ret);
 }