Merged into drm-misc-next

Am 01.07.24 um 21:56 schrieb Thorsten Blum:
The if condition !A || A && B can be simplified to !A || B.

Fixes the following Coccinelle/coccicheck warning reported by
excluded_middle.cocci:

        WARNING !A || A && B is equivalent to !A || B

Compile-tested only.

Acked-by: Thomas Zimmermann <tzimmerm...@suse.de>
Signed-off-by: Thorsten Blum <thorsten.b...@toblux.com>
---
  drivers/gpu/drm/drm_managed.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/drm_managed.c b/drivers/gpu/drm/drm_managed.c
index 7646f67bda4e..79ce86a5bd67 100644
--- a/drivers/gpu/drm/drm_managed.c
+++ b/drivers/gpu/drm/drm_managed.c
@@ -197,7 +197,7 @@ void drmm_release_action(struct drm_device *dev,
        spin_lock_irqsave(&dev->managed.lock, flags);
        list_for_each_entry_reverse(dr, &dev->managed.resources, node.entry) {
                if (dr->node.release == action) {
-                       if (!data || (data && *(void **)dr->data == data)) {
+                       if (!data || *(void **)dr->data == data) {
                                dr_match = dr;
                                del_dr(dev, dr_match);
                                break;

--
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstrasse 146, 90461 Nuernberg, Germany
GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman
HRB 36809 (AG Nuernberg)

Reply via email to