Skip to contentSkip to conversation

drm/gem: remove redundant NULL check

PATCH New Jiapeng Zhong 1 participant 1 message Jan 26, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/gem: remove redundant NULL check

Fix below warnings reported by coccicheck:
./drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c:80:2-8: WARNING: NULL check before some freeing functions is not needed. ./drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c:612:2-8: WARNING: NULL check before some freeing functions is not needed.

---
 drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c  |  3 +--
 drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 12 ++++--------
 2 files changed, 5 insertions(+), 10 deletions(-)
drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c +1 -2
index d9bd832..c402d424 100644
@@ -80,8 +80,7 @@ static void etnaviv_gem_prime_release(struct etnaviv_gem_object *etnaviv_obj)
 	/* Don't drop the pages for imported dmabuf, as they are not
 	 * ours, just free the array we allocated:
 	 */
-	if (etnaviv_obj->pages)
-		kvfree(etnaviv_obj->pages);
+	kvfree(etnaviv_obj->pages);
 
 	drm_prime_gem_destroy(&etnaviv_obj->base, etnaviv_obj->sgt);
 }
drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c +4 -8
index d05c359..bd0d66e 100644
@@ -612,14 +612,10 @@ int etnaviv_ioctl_gem_submit(struct drm_device *dev, void *data,
 err_submit_cmds:
 	if (ret && (out_fence_fd >= 0))
 		put_unused_fd(out_fence_fd);
-	if (stream)
-		kvfree(stream);
-	if (bos)
-		kvfree(bos);
-	if (relocs)
-		kvfree(relocs);
-	if (pmrs)
-		kvfree(pmrs);
+	kvfree(stream);
+	kvfree(bos);
+	kvfree(relocs);
+	kvfree(pmrs);
 
 	return ret;
 }
Signature · 1 line
1.8.3.1