diff --git a/src/freedreno/vulkan/tu_drirc_gen.py b/src/freedreno/vulkan/tu_drirc_gen.py
index 18938eb1a40..b0bf7563564 100644
--- a/src/freedreno/vulkan/tu_drirc_gen.py
+++ b/src/freedreno/vulkan/tu_drirc_gen.py
@@ -134,7 +134,7 @@ def main():
 
     options = declare_options()
 
-    drirc_gen.drirc_validate([args.validate], options, driver="turnip")
+    drirc_gen.drirc_validate([args.validate], options)
 
     drirc_gen.drirc_generate(args.drirc_src, args.drirc_hdr, "turnip", options)
 
diff --git a/src/intel/vulkan/anv_drirc_gen.py b/src/intel/vulkan/anv_drirc_gen.py
index 63b93deb15a..d753aff4278 100644
--- a/src/intel/vulkan/anv_drirc_gen.py
+++ b/src/intel/vulkan/anv_drirc_gen.py
@@ -253,7 +253,7 @@ def main():
 
     options = declare_options(args.android_ver)
 
-    drirc_gen.drirc_validate([args.validate], options, driver="anv")
+    drirc_gen.drirc_validate([args.validate], options)
 
     drirc_gen.drirc_generate(args.drirc_src, args.drirc_hdr, "anv", options)
 
diff --git a/src/util/drirc_gen.py b/src/util/drirc_gen.py
index 5c5300c6700..52e604e6200 100644
--- a/src/util/drirc_gen.py
+++ b/src/util/drirc_gen.py
@@ -215,24 +215,15 @@ ${driver_prefix}_parse_dri_options(struct ${driver_prefix}_drirc *drirc,
 }
 """
 
-def drirc_validate(conf_paths, sections, driver=None):
+def drirc_validate(conf_paths, sections):
     declared = {opt.name for section in sections for opt in section.options}
     conf_names = set()
     for conf_path in conf_paths:
         tree = ET.parse(conf_path)
-        if driver is None:
-            for option in tree.iter('option'):
-                name = option.get('name')
-                if name:
-                    conf_names.add(name)
-        else:
-            for device in tree.iter('device'):
-                if device.get('driver') != driver:
-                    continue
-                for option in device.iter('option'):
-                    name = option.get('name')
-                    if name:
-                        conf_names.add(name)
+        for option in tree.iter('option'):
+            name = option.get('name')
+            if name:
+                conf_names.add(name)
     missing = conf_names - declared
     if missing:
         print('ERROR: options used in conf but not declared:', file=sys.stderr)