From 3aec638a8beda9f82927f13ba24618469219c9e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Se=C3=A1n=20de=20B=C3=BArca?= <leftmostcat@gmail.com>
Date: Tue, 25 Mar 2025 15:16:52 -0700
Subject: [PATCH] rusticl: remove unnecessary check for device in kernel list

There is no need to verify that `kernel.prog.devs` contains a device
when that device ref was pulled from `kernel.prog.devs` immediately
beforehand.

Reviewed-by: Karol Herbst <kherbst@redhat.com>
Reviewed-by: @LingMan
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34167>
---
 src/gallium/frontends/rusticl/api/kernel.rs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/gallium/frontends/rusticl/api/kernel.rs b/src/gallium/frontends/rusticl/api/kernel.rs
index 986ee434055..22679682094 100644
--- a/src/gallium/frontends/rusticl/api/kernel.rs
+++ b/src/gallium/frontends/rusticl/api/kernel.rs
@@ -101,13 +101,15 @@ unsafe impl CLInfoObj<cl_kernel_work_group_info, cl_device_id> for cl_kernel {
                 kernel.prog.devs[0]
             }
         } else {
-            Device::ref_from_raw(dev)?
-        };
+            let dev = Device::ref_from_raw(dev)?;
 
-        // CL_INVALID_DEVICE if device is not in the list of devices associated with kernel
-        if !kernel.prog.devs.contains(&dev) {
-            return Err(CL_INVALID_DEVICE);
-        }
+            // CL_INVALID_DEVICE if device is not in the list of devices associated with kernel
+            if !kernel.prog.devs.contains(&dev) {
+                return Err(CL_INVALID_DEVICE);
+            }
+
+            dev
+        };
 
         match *q {
             CL_KERNEL_COMPILE_WORK_GROUP_SIZE => v.write::<[usize; 3]>(kernel.work_group_size()),