Skip to contentSkip to conversation

drm: fix ifnullfree.cocci warnings

PATCH In review Julia Lawall 2 participants 3 messages Mar 27, 2020 – Mar 31, 2020

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

PATCH 1/1 drm: fix ifnullfree.cocci warnings

NULL check before kfree is not needed.

Generated by: scripts/coccinelle/free/ifnullfree.cocci

Fixes c6603c740e0e ("drm: add managed resources tied to drm_device")

---

tree:   git://anongit.freedesktop.org/drm/drm-misc drm-misc-next
head:   9e1ed9fb1eb0a4bc43a26365c592d3095286038b
commit: c6603c740e0e3492c9c95fdab833375bf7117b6b [1587/1636] drm: add managed resources tied to drm_device

:::::: branch date: 8 hours ago
:::::: commit date: 9 hours ago

Up to you, if you tihnk it is useful...

 drm_drv.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_drv.c +2 -1
@@ -837,8 +837,9 @@ static void drm_dev_release(struct kref
 	if (!dev->driver->release && !dev->managed.final_kfree) {
 		WARN_ON(!list_empty(&dev->managed.resources));
 		kfree(dev);
-	} else if (dev->managed.final_kfree)
+	} else {
 		kfree(dev->managed.final_kfree);
+	}
 }
 
 /**
#1 lore raw
Quoted 10 lines · Julia Lawall

NULL check before kfree is not needed.

Generated by: scripts/coccinelle/free/ifnullfree.cocci

Fixes c6603c740e0e ("drm: add managed resources tied to drm_device")

---

tree: git://anongit.freedesktop.org/drm/drm-misc drm-misc-next

Hm this doesn't apply anymore, the patch is for an interim state (because bisectability). Care to regen (the pattern still exists), I'm happy to apply.
-Daniel

Quoted 23 lines
head:   9e1ed9fb1eb0a4bc43a26365c592d3095286038b
commit: c6603c740e0e3492c9c95fdab833375bf7117b6b [1587/1636] drm: add managed resources tied to drm_device

:::::: branch date: 8 hours ago
:::::: commit date: 9 hours ago

Up to you, if you tihnk it is useful...

 drm_drv.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_drv.c +2 -1
@@ -837,8 +837,9 @@ static void drm_dev_release(struct kref
 	if (!dev->driver->release && !dev->managed.final_kfree) {
 		WARN_ON(!list_empty(&dev->managed.resources));
 		kfree(dev);
-	} else if (dev->managed.final_kfree)
+	} else {
 		kfree(dev->managed.final_kfree);
+	}
 }
 
 /**
Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
#2 lore raw
Quoted 10 lines · Daniel Vetter
Quoted 9 lines · Julia Lawall

NULL check before kfree is not needed.

Generated by: scripts/coccinelle/free/ifnullfree.cocci

Fixes c6603c740e0e ("drm: add managed resources tied to drm_device")

---

Quoted 5 lines
Quoted 1 line

tree: git://anongit.freedesktop.org/drm/drm-misc drm-misc-next

Hm this doesn't apply anymore, the patch is for an interim state (because bisectability). Care to regen (the pattern still exists), I'm happy to apply.

Maybe 0-day will produce it again?

julia

Quoted 31 lines

-Daniel

Quoted 13 lines
head:   9e1ed9fb1eb0a4bc43a26365c592d3095286038b
commit: c6603c740e0e3492c9c95fdab833375bf7117b6b [1587/1636] drm: add managed resources tied to drm_device

:::::: branch date: 8 hours ago
:::::: commit date: 9 hours ago

Up to you, if you tihnk it is useful...

 drm_drv.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

drivers/gpu/drm/drm_drv.c static void drm_dev_release(struct kref · line 845

Quoted 10 lines
drivers/gpu/drm/drm_drv.c +2 -1
@@ -837,8 +837,9 @@ static void drm_dev_release(struct kref
 	if (!dev->driver->release && !dev->managed.final_kfree) {
 		WARN_ON(!list_empty(&dev->managed.resources));
 		kfree(dev);
-	} else if (dev->managed.final_kfree)
+	} else {
 		kfree(dev->managed.final_kfree);
+	}
 }
 
 /**

--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch