Skip to contentSkip to conversation

drm: amd: amdgpu: Remove NULL check not needed before freeing functions

PATCH In review Saurav Girepunje 2 participants 2 messages Oct 29, 2019

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

PATCH 1/1 drm: amd: amdgpu: Remove NULL check not needed before freeing functions

Remove unneeded NULL check before freeing functions kfree and debugfs_remove.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +2 -4
index 5652cc72ed3a..cb94627fc0f4 100644
@@ -1077,8 +1077,7 @@ static int amdgpu_debugfs_ib_preempt(void *data, u64 val)
 
 	ttm_bo_unlock_delayed_workqueue(&adev->mman.bdev, resched);
 
-	if (fences)
-		kfree(fences);
+	kfree(fences);
 
 	return 0;
 }
@@ -1103,8 +1102,7 @@ int amdgpu_debugfs_init(struct amdgpu_device *adev)
 
 void amdgpu_debugfs_preempt_cleanup(struct amdgpu_device *adev)
 {
-	if (adev->debugfs_preempt)
-		debugfs_remove(adev->debugfs_preempt);
+	debugfs_remove(adev->debugfs_preempt);
 }
 
 #else
Signature · 1 line
2.20.1
#1 lore raw

Hi Saurav,

the driver already has the same fix patch,
you can pull the latest driver tree and check it again, thanks.

Quoted 1 line

From 2032324682c1ca563e33c56e51d9ae17a2b38105 Mon Sep 17 00:00:00 2001

From: zhong jiang <[email protected]>
Date: Tue, 3 Sep 2019 14:15:05 +0800
Subject: [PATCH] drm/amdgpu: remove the redundant null checks

debugfs_remove and kfree has taken the null check in account. hence it is unnecessary to check it. Just remove the condition. No functional change.

This issue was detected by using the Coccinelle software.

Best Regards,
Kevin
________________________________
From: Saurav Girepunje <[email protected]>
Sent: Tuesday, October 29, 2019 5:19 PM
To: Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Zhou, David(ChunMing) <[email protected]>; [email protected] <[email protected]>; daniel-/[email protected] <daniel-/[email protected]>; StDenis, Tom <[email protected]>; [email protected] <[email protected]>; Xiao, Jack <[email protected]>; [email protected] <[email protected]>; Wang, Kevin(Yang) <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>
Cc: [email protected] <[email protected]>
Subject: [PATCH] drm: amd: amdgpu: Remove NULL check not needed before freeing functions

Remove unneeded NULL check before freeing functions kfree and debugfs_remove.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +2 -4
index 5652cc72ed3a..cb94627fc0f4 100644
@@ -1077,8 +1077,7 @@ static int amdgpu_debugfs_ib_preempt(void *data, u64 val)
 
         ttm_bo_unlock_delayed_workqueue(&adev->mman.bdev, resched);
 
-       if (fences)
-               kfree(fences);
+       kfree(fences);
 
         return 0;
 }
@@ -1103,8 +1102,7 @@ int amdgpu_debugfs_init(struct amdgpu_device *adev)
 
 void amdgpu_debugfs_preempt_cleanup(struct amdgpu_device *adev)
 {
-       if (adev->debugfs_preempt)
-               debugfs_remove(adev->debugfs_preempt);
+       debugfs_remove(adev->debugfs_preempt);
 }
 
 #else

--
2.20.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx