aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Elfring <elfring@users.sourceforge.net>2016-07-22 09:56:15 -0400
committerSean Paul <seanpaul@chromium.org>2016-07-22 13:51:31 -0400
commit8c6e6188703d81c2b926566009901d21a8fdb94d (patch)
tree1f702c95cf286343d4fa0c6cbdfe962dfcc137e2
parent0bc329976bc178aacf78ca6e3de8084e8e7eb5e4 (diff)
drm/etnaviv: Delete unnecessary checks before two function calls
The functions drm_gem_object_unreference_unlocked() and vunmap() perform also input parameter validation. Thus the tests around their calls are not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> [seanpaul tweaked subject] Signed-off-by: Sean Paul <seanpaul@chromium.org> Link: http://patchwork.freedesktop.org/patch/msgid/9638cd74-ffc5-d9ee-a40c-9b60e860ad8b@users.sourceforge.net
-rw-r--r--drivers/gpu/drm/etnaviv/etnaviv_gem.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
index df9bcbab922f..356056ab63d7 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
@@ -535,8 +535,7 @@ void etnaviv_gem_describe_objects(struct etnaviv_drm_private *priv,
535 535
536static void etnaviv_gem_shmem_release(struct etnaviv_gem_object *etnaviv_obj) 536static void etnaviv_gem_shmem_release(struct etnaviv_gem_object *etnaviv_obj)
537{ 537{
538 if (etnaviv_obj->vaddr) 538 vunmap(etnaviv_obj->vaddr);
539 vunmap(etnaviv_obj->vaddr);
540 put_pages(etnaviv_obj); 539 put_pages(etnaviv_obj);
541} 540}
542 541
@@ -670,9 +669,7 @@ static struct drm_gem_object *__etnaviv_gem_new(struct drm_device *dev,
670 return obj; 669 return obj;
671 670
672fail: 671fail:
673 if (obj) 672 drm_gem_object_unreference_unlocked(obj);
674 drm_gem_object_unreference_unlocked(obj);
675
676 return ERR_PTR(ret); 673 return ERR_PTR(ret);
677} 674}
678 675