Revert "device: iterable supported devices"

This reverts commit 0c6588f.

It's not clear that the supported devices are being properly computed,
so let's revert this for v2.7.0 until we've had more time to think
it through.

Signed-off-by: Martí Bolívar <[email protected]>

Author: mbolivar-nordic

include/device.h

@@ -699,17 +699,13 @@ static inline bool device_is_ready(const struct device *dev)
  *     List of devicetree dependency ordinals (if any),
  *     DEVICE_HANDLE_SEP,
  *     List of injected dependency ordinals (if any),
- *     DEVICE_HANDLE_SEP,
- *     List of devicetree supporting ordinals (if any),
  * }
  *
  * After processing in gen_handles.py, the format is updated to:
  * {
  *     List of existing devicetree dependency handles (if any),
  *     DEVICE_HANDLE_SEP,
  *     List of injected dependency ordinals (if any),
- *     DEVICE_HANDLE_SEP,
- *     List of existing devicetree support handles (if any),
  *     DEVICE_HANDLE_NULL padding to original length (at least one)
  * }
  *
@@ -741,9 +737,6 @@ BUILD_ASSERT(sizeof(device_handle_t) == 2, "fix the linker scripts");
 		))							\
 			DEVICE_HANDLE_SEP,				\
 			Z_DEVICE_EXTRA_HANDLES(__VA_ARGS__)		\
-			DEVICE_HANDLE_SEP,				\
-	COND_CODE_1(DT_NODE_EXISTS(node_id),				\
-			(DT_SUPPORTS_DEP_ORDS(node_id)), ())		\
 		};
 
 #ifdef CONFIG_PM_DEVICE

scripts/gen_handles.py

@@ -246,19 +246,15 @@ def main():
         hvi = 1
         handle.dev_deps = []
         handle.ext_deps = []
-        handle.dev_sups = []
-        hdls = handle.dev_deps
+        deps = handle.dev_deps
         while hvi < len(hv):
             h = hv[hvi]
             if h == DEVICE_HANDLE_ENDS:
                 break
             if h == DEVICE_HANDLE_SEP:
-                if hdls == handle.dev_deps:
-                    hdls = handle.ext_deps
-                else:
-                    hdls = handle.dev_sups
+                deps = handle.ext_deps
             else:
-                hdls.append(h)
+                deps.append(h)
                 n = edt
             hvi += 1
 
@@ -271,7 +267,6 @@ def main():
     for sn in used_nodes:
         # Where we're storing the final set of nodes: these are all used
         sn.__depends = set()
-        sn.__supports = set()
 
         deps = set(sn.depends_on)
         debug("\nNode: %s\nOrig deps:\n\t%s" % (sn.path, "\n\t".join([dn.path for dn in deps])))
@@ -284,16 +279,7 @@ def main():
                 # forward the dependency up one level
                 for ddn in dn.depends_on:
                     deps.add(ddn)
-        debug("Final deps:\n\t%s\n" % ("\n\t".join([ _dn.path for _dn in sn.__depends])))
-
-        sups = set(sn.required_by)
-        debug("\nOrig sups:\n\t%s" % ("\n\t".join([dn.path for dn in sups])))
-        while len(sups) > 0:
-            dn = sups.pop()
-            if dn in used_nodes:
-                # this is used
-                sn.__supports.add(dn)
-        debug("\nFinal sups:\n\t%s" % ("\n\t".join([dn.path for dn in sn.__supports])))
+        debug("final deps:\n\t%s\n" % ("\n\t".join([ _dn.path for _dn in sn.__depends])))
 
     with open(args.output_source, "w") as fp:
         fp.write('#include <device.h>\n')
@@ -304,7 +290,6 @@ def main():
             assert hs, "no hs for %s" % (dev.sym.name,)
             dep_paths = []
             ext_paths = []
-            sup_paths = []
             hdls = []
 
             sn = hs.node
@@ -315,24 +300,13 @@ def main():
                         dep_paths.append(dn.path)
                     else:
                         dep_paths.append('(%s)' % dn.path)
-
             # Force separator to signal start of injected dependencies
             hdls.append(DEVICE_HANDLE_SEP)
             if len(hs.ext_deps) > 0:
                 # TODO: map these to something smaller?
                 ext_paths.extend(map(str, hs.ext_deps))
                 hdls.extend(hs.ext_deps)
 
-            # Force separator to signal start of supported devices
-            hdls.append(DEVICE_HANDLE_SEP)
-            if len(hs.dev_sups) > 0:
-                for dn in sn.required_by:
-                    if dn in sn.__supports:
-                        sup_paths.append(dn.path)
-                    else:
-                        sup_paths.append('(%s)' % dn.path)
-                hdls.extend(dn.__device.dev_handle for dn in sn.__supports)
-
             # When CONFIG_USERSPACE is enabled the pre-built elf is
             # also used to get hashes that identify kernel objects by
             # address. We can't allow the size of any object in the
@@ -349,14 +323,9 @@ def main():
             ]
 
             if len(dep_paths) > 0:
-                lines.append(' * Direct Dependencies:')
-                lines.append(' *   - %s' % ('\n *   - '.join(dep_paths)))
+                lines.append(' * - %s' % ('\n * - '.join(dep_paths)))
             if len(ext_paths) > 0:
-                lines.append(' * Injected Dependencies:')
-                lines.append(' *   - %s' % ('\n *   - '.join(ext_paths)))
-            if len(sup_paths) > 0:
-                lines.append(' * Supported:')
-                lines.append(' *   - %s' % ('\n *   - '.join(sup_paths)))
+                lines.append(' * + %s' % ('\n * + '.join(ext_paths)))
 
             lines.extend([
                 ' */',