Skip to contentSkip to conversation

drm/etnaviv: remove no need NULL check

PATCH In review Bernard Zhao 2 participants 2 messages Jun 5, 2021 – Jun 7, 2021

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

PATCH 1/1 drm/etnaviv: remove no need NULL check

NULL check before kvfree functions is not needed.

---
 drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c +4 -8
index d05c35994579..bd0d66ebf314 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
2.31.0
#1 lore raw

Am Sa., 5. Juni 2021 um 14:24 Uhr schrieb Bernard Zhao <[email protected]>:

Quoted 32 lines

NULL check before kvfree functions is not needed.

---
 drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c +4 -9
index d05c35994579..bd0d66ebf314 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;
 }
--
Quoted 2 lines

2.31.0

Thanks for the patch, but there is an other one queued up in etnaviv/next that fixes the same issue:
https://git.pengutronix.de/cgit/lst/linux/commit/?h=etnaviv/next&id=bdf622e0fade2cec72c948c708763378b656c01d

Signature · 5 lines
greets
--
Christian Gmeiner, MSc

https://christian-gmeiner.info/privacypolicy