Drop unneeded inner function

The result should be exactly the same.

One of the loops was using inverted logic (continue-if-not-else-yield instead
of yield-if), so invert that for consistency.

diff --git a/mkosi/kmod.py b/mkosi/kmod.py
index d9efef8caaad21d4eee44c37dd6333952a1b60b9..ee49c25d56b9cd371dfeb8f00a32c852afa5b62c 100644 (file)
--- a/mkosi/kmod.py
+++ b/mkosi/kmod.py
@@ -157,32 +157,27 @@ def gen_required_kernel_modules(
     names = [module_path_to_name(m) for m in modules]
     mods, firmware = resolve_module_dependencies(root, kver, names, sandbox=sandbox)
 
-    def files() -> Iterator[Path]:
-        yield modulesd.parent
-        yield modulesd
-        yield modulesd / "kernel"
+    yield modulesd.parent
+    yield modulesd
+    yield modulesd / "kernel"
 
-        for d in (modulesd, root / "usr/lib/firmware"):
-            for p in (root / d).rglob("*"):
-                if p.is_dir():
-                    yield p
-
-        for p in sorted(mods) + sorted(firmware):
-            yield p
+    for d in (modulesd, root / "usr/lib/firmware"):
+        for p in (root / d).rglob("*"):
+            if p.is_dir():
+                yield p
 
-        for p in (root / modulesd).iterdir():
-            if not p.name.startswith("modules"):
-                continue
+    for p in sorted(mods) + sorted(firmware):
+        yield p
 
+    for p in (root / modulesd).iterdir():
+        if p.name.startswith("modules"):
             yield p
 
-        if (root / modulesd / "vdso").exists():
-            yield modulesd / "vdso"
+    if (root / modulesd / "vdso").exists():
+        yield modulesd / "vdso"
 
-            for p in (root / modulesd / "vdso").iterdir():
-                yield p
-
-    return files()
+        for p in (root / modulesd / "vdso").iterdir():
+            yield p
 
 
 def process_kernel_modules(