interface: Simplify return attribute

114 files changed, 132 insertions, 354 deletions

diff --git a/rtemsspec/interface.py b/rtemsspec/interface.py
index b275d373..fa66fe8a 100644
--- a/rtemsspec/interface.py
+++ b/rtemsspec/interface.py
@@ -594,8 +594,8 @@ class Node:
                 content.add_param_description(item["params"],
                                               self.substitute_text)
             content.doxyfy(self.substitute_text(item["description"]))
-            if "return" in item:
-                ret = item["return"]
+            ret = item.get("return", None)
+            if ret:
                 for retval in ret["return-values"]:
                     content.wrap(self.substitute_text(retval["description"]),
                                  initial_indent=self.substitute_text(
diff --git a/rtemsspec/interfacedoc.py b/rtemsspec/interfacedoc.py
index 1091f98b..f902a075 100644
--- a/rtemsspec/interfacedoc.py
+++ b/rtemsspec/interfacedoc.py
@@ -187,18 +187,17 @@ def _generate_directive(content: SphinxContent, mapper: _Mapper,
         content.add(".. rubric:: DESCRIPTION:")
         content.wrap(mapper.substitute(item["description"]))
     ret = item["return"]
-    if ret["return"] or ret["return-values"]:
+    if ret:
         content.add(".. rubric:: RETURN VALUES:")
-        if ret["return-values"]:
-            for retval in ret["return-values"]:
-                if isinstance(retval["value"], str):
-                    value = mapper.substitute(str(retval["value"]))
-                else:
-                    value = f"``{str(retval['value'])}``"
-                content.add_definition_item(value,
-                                            mapper.substitute(
-                                                retval["description"]),
-                                            wrap=True)
+        for retval in ret["return-values"]:
+            if isinstance(retval["value"], str):
+                value = mapper.substitute(str(retval["value"]))
+            else:
+                value = f"``{str(retval['value'])}``"
+            content.add_definition_item(value,
+                                        mapper.substitute(
+                                            retval["description"]),
+                                        wrap=True)
         content.wrap(mapper.substitute(ret["return"]))
     if item["notes"]:
         content.add(".. rubric:: NOTES:")
diff --git a/rtemsspec/tests/spec-interface/func.yml b/rtemsspec/tests/spec-interface/func.yml
index aeb15df5..e02a2d90 100644
--- a/rtemsspec/tests/spec-interface/func.yml
+++ b/rtemsspec/tests/spec-interface/func.yml
@@ -52,7 +52,5 @@ params:
 - description: null
   dir: null
   name: Param4
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/rtemsspec/tests/spec-interface/func3.yml b/rtemsspec/tests/spec-interface/func3.yml
index 885c941a..97eeda46 100644
--- a/rtemsspec/tests/spec-interface/func3.yml
+++ b/rtemsspec/tests/spec-interface/func3.yml
@@ -23,7 +23,5 @@ links:
 name: VoidFunction
 notes: null
 params: []
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/rtemsspec/tests/spec-interface/func5.yml b/rtemsspec/tests/spec-interface/func5.yml
index 10caf426..bc8f6efd 100644
--- a/rtemsspec/tests/spec-interface/func5.yml
+++ b/rtemsspec/tests/spec-interface/func5.yml
@@ -21,7 +21,5 @@ links:
 name: Func5
 notes: null
 params: []
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/rtemsspec/tests/spec-interface/func6.yml b/rtemsspec/tests/spec-interface/func6.yml
index 7a2455a4..27c64428 100644
--- a/rtemsspec/tests/spec-interface/func6.yml
+++ b/rtemsspec/tests/spec-interface/func6.yml
@@ -23,7 +23,5 @@ params:
 - description: null
   dir: null
   name: Param0
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/rtemsspec/tests/spec-interface/macro3.yml b/rtemsspec/tests/spec-interface/macro3.yml
index 729c5507..eed7e52b 100644
--- a/rtemsspec/tests/spec-interface/macro3.yml
+++ b/rtemsspec/tests/spec-interface/macro3.yml
@@ -17,7 +17,5 @@ links:
 name: MACRO
 notes: null
 params: []
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/bsp/sparc/if/grlib-store-08.yml b/spec/bsp/sparc/if/grlib-store-08.yml
index b4015ea9..9a6ac6bb 100644
--- a/spec/bsp/sparc/if/grlib-store-08.yml
+++ b/spec/bsp/sparc/if/grlib-store-08.yml
@@ -33,7 +33,5 @@ params:
     is the value to store.
   dir: null
   name: value
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/bsp/sparc/if/grlib-store-16.yml b/spec/bsp/sparc/if/grlib-store-16.yml
index f06cb5e8..236a907e 100644
--- a/spec/bsp/sparc/if/grlib-store-16.yml
+++ b/spec/bsp/sparc/if/grlib-store-16.yml
@@ -33,7 +33,5 @@ params:
     is the value to store.
   dir: null
   name: value
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/bsp/sparc/if/grlib-store-32.yml b/spec/bsp/sparc/if/grlib-store-32.yml
index c3cc9e6a..978bf8e3 100644
--- a/spec/bsp/sparc/if/grlib-store-32.yml
+++ b/spec/bsp/sparc/if/grlib-store-32.yml
@@ -33,7 +33,5 @@ params:
     is the value to store.
   dir: null
   name: value
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/bsp/sparc/if/grlib-store-64.yml b/spec/bsp/sparc/if/grlib-store-64.yml
index 8e5c31a8..1f36ecf6 100644
--- a/spec/bsp/sparc/if/grlib-store-64.yml
+++ b/spec/bsp/sparc/if/grlib-store-64.yml
@@ -33,7 +33,5 @@ params:
     is the value to store.
   dir: null
   name: value
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/dev/grlib/if/apbuart-outbyte-polled.yml b/spec/dev/grlib/if/apbuart-outbyte-polled.yml
index 60c9457c..1ab9e16d 100644
--- a/spec/dev/grlib/if/apbuart-outbyte-polled.yml
+++ b/spec/dev/grlib/if/apbuart-outbyte-polled.yml
@@ -33,7 +33,5 @@ params:
     is the character to output.
   dir: null
   name: ch
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/dev/grlib/if/apbuart-outbyte-wait.yml b/spec/dev/grlib/if/apbuart-outbyte-wait.yml
index 7346158d..8917f073 100644
--- a/spec/dev/grlib/if/apbuart-outbyte-wait.yml
+++ b/spec/dev/grlib/if/apbuart-outbyte-wait.yml
@@ -27,7 +27,5 @@ params:
     is the pointer to the APBUART register block.
   dir: null
   name: regs
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/basedefs/if/alias.yml b/spec/rtems/basedefs/if/alias.yml
index 6f12c2c7..921fb87c 100644
--- a/spec/rtems/basedefs/if/alias.yml
+++ b/spec/rtems/basedefs/if/alias.yml
@@ -26,7 +26,5 @@ params:
     is the target function name.
   dir: null
   name: _target
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/basedefs/if/aligned.yml b/spec/rtems/basedefs/if/aligned.yml
index 0f437100..5eee754c 100644
--- a/spec/rtems/basedefs/if/aligned.yml
+++ b/spec/rtems/basedefs/if/aligned.yml
@@ -27,7 +27,5 @@ params:
     is the desired alignment in bytes.
   dir: null
   name: _alignment
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/basedefs/if/alloc-align.yml b/spec/rtems/basedefs/if/alloc-align.yml
index 436ef224..0c07ac41 100644
--- a/spec/rtems/basedefs/if/alloc-align.yml
+++ b/spec/rtems/basedefs/if/alloc-align.yml
@@ -27,7 +27,5 @@ params:
     is the allocation alignment parameter index (starting with one).
   dir: null
   name: _index
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/basedefs/if/alloc-size-2.yml b/spec/rtems/basedefs/if/alloc-size-2.yml
index 681ca181..ad537e3b 100644
--- a/spec/rtems/basedefs/if/alloc-size-2.yml
+++ b/spec/rtems/basedefs/if/alloc-size-2.yml
@@ -31,7 +31,5 @@ params:
     is the allocation item size parameter index (starting with one).
   dir: null
   name: _size_index
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/basedefs/if/alloc-size.yml b/spec/rtems/basedefs/if/alloc-size.yml
index 2926d745..24348e57 100644
--- a/spec/rtems/basedefs/if/alloc-size.yml
+++ b/spec/rtems/basedefs/if/alloc-size.yml
@@ -27,7 +27,5 @@ params:
     is the allocation size parameter index (starting with one).
   dir: null
   name: _index
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/basedefs/if/compiler-memory-barrier.yml b/spec/rtems/basedefs/if/compiler-memory-barrier.yml
index ad70a195..501d68f0 100644
--- a/spec/rtems/basedefs/if/compiler-memory-barrier.yml
+++ b/spec/rtems/basedefs/if/compiler-memory-barrier.yml
@@ -23,7 +23,5 @@ links:
 name: RTEMS_COMPILER_MEMORY_BARRIER
 notes: null
 params: []
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/basedefs/if/declare-global-symbol.yml b/spec/rtems/basedefs/if/declare-global-symbol.yml
index 6eeb5090..42bf0af4 100644
--- a/spec/rtems/basedefs/if/declare-global-symbol.yml
+++ b/spec/rtems/basedefs/if/declare-global-symbol.yml
@@ -24,7 +24,5 @@ params:
     is the name of the global symbol.  It shall be a valid designator.
   dir: null
   name: _name
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/basedefs/if/deconst.yml b/spec/rtems/basedefs/if/deconst.yml
index e1035d67..3f5be7f4 100644
--- a/spec/rtems/basedefs/if/deconst.yml
+++ b/spec/rtems/basedefs/if/deconst.yml
@@ -29,7 +29,5 @@ params:
     is the pointer variable.
   dir: null
   name: _var
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/basedefs/if/define-global-symbol.yml b/spec/rtems/basedefs/if/define-global-symbol.yml
index cd01c054..e918ae46 100644
--- a/spec/rtems/basedefs/if/define-global-symbol.yml
+++ b/spec/rtems/basedefs/if/define-global-symbol.yml
@@ -39,7 +39,5 @@ params:
     understood by the assembler.
   dir: null
   name: _value
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/basedefs/if/dequalify-depthx.yml b/spec/rtems/basedefs/if/dequalify-depthx.yml
index cba1764f..5eda28ff 100644
--- a/spec/rtems/basedefs/if/dequalify-depthx.yml
+++ b/spec/rtems/basedefs/if/dequalify-depthx.yml
@@ -46,7 +46,5 @@ params:
     is the variable.
   dir: null
   name: _var
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/basedefs/if/dequalify.yml b/spec/rtems/basedefs/if/dequalify.yml
index 40152c34..56051a46 100644
--- a/spec/rtems/basedefs/if/dequalify.yml
+++ b/spec/rtems/basedefs/if/dequalify.yml
@@ -29,7 +29,5 @@ params:
     is the pointer variable.
   dir: null
   name: _var
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/basedefs/if/devolatile.yml b/spec/rtems/basedefs/if/devolatile.yml
index afcb902c..c23760ad 100644
--- a/spec/rtems/basedefs/if/devolatile.yml
+++ b/spec/rtems/basedefs/if/devolatile.yml
@@ -29,7 +29,5 @@ params:
     is the pointer variable.
   dir: null
   name: _var
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/basedefs/if/expand.yml b/spec/rtems/basedefs/if/expand.yml
index f0b2fa48..4a362a66 100644
--- a/spec/rtems/basedefs/if/expand.yml
+++ b/spec/rtems/basedefs/if/expand.yml
@@ -22,7 +22,5 @@ params:
     is the token to expand.
   dir: null
   name: _token
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/basedefs/if/obfuscate-variable.yml b/spec/rtems/basedefs/if/obfuscate-variable.yml
index 706fa94a..87fcd05c 100644
--- a/spec/rtems/basedefs/if/obfuscate-variable.yml
+++ b/spec/rtems/basedefs/if/obfuscate-variable.yml
@@ -29,7 +29,5 @@ params:
     is the variable to obfuscate.
   dir: null
   name: _var
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/basedefs/if/printflike.yml b/spec/rtems/basedefs/if/printflike.yml
index 753153a4..585b96ba 100644
--- a/spec/rtems/basedefs/if/printflike.yml
+++ b/spec/rtems/basedefs/if/printflike.yml
@@ -32,7 +32,5 @@ params:
     one).
   dir: null
   name: _ap_pos
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/basedefs/if/section.yml b/spec/rtems/basedefs/if/section.yml
index 9c842746..ae9c6f13 100644
--- a/spec/rtems/basedefs/if/section.yml
+++ b/spec/rtems/basedefs/if/section.yml
@@ -26,7 +26,5 @@ params:
     is the section name as a string.
   dir: null
   name: _section
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/basedefs/if/static-assert.yml b/spec/rtems/basedefs/if/static-assert.yml
index 4ca2d232..e185770c 100644
--- a/spec/rtems/basedefs/if/static-assert.yml
+++ b/spec/rtems/basedefs/if/static-assert.yml
@@ -36,7 +36,5 @@ params:
     is the error message in case the static assertion fails.
   dir: null
   name: _msg
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/basedefs/if/unreachable.yml b/spec/rtems/basedefs/if/unreachable.yml
index 1843d5e4..9322c1e5 100644
--- a/spec/rtems/basedefs/if/unreachable.yml
+++ b/spec/rtems/basedefs/if/unreachable.yml
@@ -26,7 +26,5 @@ links:
 name: RTEMS_UNREACHABLE
 notes: null
 params: []
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/basedefs/if/weak-alias.yml b/spec/rtems/basedefs/if/weak-alias.yml
index 10f6f12c..9853ed94 100644
--- a/spec/rtems/basedefs/if/weak-alias.yml
+++ b/spec/rtems/basedefs/if/weak-alias.yml
@@ -26,7 +26,5 @@ params:
     is the target function name.
   dir: null
   name: _target
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/cache/if/coherent-add-area.yml b/spec/rtems/cache/if/coherent-add-area.yml
index f6c8949a..bc90e3c1 100644
--- a/spec/rtems/cache/if/coherent-add-area.yml
+++ b/spec/rtems/cache/if/coherent-add-area.yml
@@ -38,7 +38,5 @@ params:
     is the size in bytes of the cache coherent memory area to add.
   dir: null
   name: size
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/cache/if/coherent-free.yml b/spec/rtems/cache/if/coherent-free.yml
index 1e849c1a..e8645ce5 100644
--- a/spec/rtems/cache/if/coherent-free.yml
+++ b/spec/rtems/cache/if/coherent-free.yml
@@ -33,7 +33,5 @@ params:
     is a pointer returned by ${coherent-allocate:/name}.
   dir: null
   name: ptr
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/cache/if/disable-data.yml b/spec/rtems/cache/if/disable-data.yml
index 488a194f..279c1221 100644
--- a/spec/rtems/cache/if/disable-data.yml
+++ b/spec/rtems/cache/if/disable-data.yml
@@ -26,7 +26,5 @@ links:
 name: rtems_cache_disable_data
 notes: null
 params: []
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/cache/if/disable-instruction.yml b/spec/rtems/cache/if/disable-instruction.yml
index 1b253342..1298f7f8 100644
--- a/spec/rtems/cache/if/disable-instruction.yml
+++ b/spec/rtems/cache/if/disable-instruction.yml
@@ -26,7 +26,5 @@ links:
 name: rtems_cache_disable_instruction
 notes: null
 params: []
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/cache/if/enable-data.yml b/spec/rtems/cache/if/enable-data.yml
index e2637aae..fee87bf7 100644
--- a/spec/rtems/cache/if/enable-data.yml
+++ b/spec/rtems/cache/if/enable-data.yml
@@ -26,7 +26,5 @@ links:
 name: rtems_cache_enable_data
 notes: null
 params: []
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/cache/if/enable-instruction.yml b/spec/rtems/cache/if/enable-instruction.yml
index c34333f2..5ea5fff5 100644
--- a/spec/rtems/cache/if/enable-instruction.yml
+++ b/spec/rtems/cache/if/enable-instruction.yml
@@ -26,7 +26,5 @@ links:
 name: rtems_cache_enable_instruction
 notes: null
 params: []
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/cache/if/flush-entire-data.yml b/spec/rtems/cache/if/flush-entire-data.yml
index c2a0fc9d..83db71ca 100644
--- a/spec/rtems/cache/if/flush-entire-data.yml
+++ b/spec/rtems/cache/if/flush-entire-data.yml
@@ -26,7 +26,5 @@ links:
 name: rtems_cache_flush_entire_data
 notes: null
 params: []
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/cache/if/flush-multiple-data-lines.yml b/spec/rtems/cache/if/flush-multiple-data-lines.yml
index ac033016..9919419f 100644
--- a/spec/rtems/cache/if/flush-multiple-data-lines.yml
+++ b/spec/rtems/cache/if/flush-multiple-data-lines.yml
@@ -38,7 +38,5 @@ params:
     is the size in bytes of the memory area to flush.
   dir: null
   name: size
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/cache/if/freeze-data.yml b/spec/rtems/cache/if/freeze-data.yml
index 91e7f705..ff9d60ba 100644
--- a/spec/rtems/cache/if/freeze-data.yml
+++ b/spec/rtems/cache/if/freeze-data.yml
@@ -26,7 +26,5 @@ links:
 name: rtems_cache_freeze_data
 notes: null
 params: []
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/cache/if/freeze-instruction.yml b/spec/rtems/cache/if/freeze-instruction.yml
index e1224b96..9fe0ebec 100644
--- a/spec/rtems/cache/if/freeze-instruction.yml
+++ b/spec/rtems/cache/if/freeze-instruction.yml
@@ -26,7 +26,5 @@ links:
 name: rtems_cache_freeze_instruction
 notes: null
 params: []
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/cache/if/instruction-sync-after-code-change.yml b/spec/rtems/cache/if/instruction-sync-after-code-change.yml
index ba047490..c8bfa871 100644
--- a/spec/rtems/cache/if/instruction-sync-after-code-change.yml
+++ b/spec/rtems/cache/if/instruction-sync-after-code-change.yml
@@ -42,7 +42,5 @@ params:
     is the size in bytes of the code area to synchronize.
   dir: null
   name: size
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/cache/if/invalidate-entire-data.yml b/spec/rtems/cache/if/invalidate-entire-data.yml
index 4d58d602..08f91964 100644
--- a/spec/rtems/cache/if/invalidate-entire-data.yml
+++ b/spec/rtems/cache/if/invalidate-entire-data.yml
@@ -26,7 +26,5 @@ links:
 name: rtems_cache_invalidate_entire_data
 notes: null
 params: []
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/cache/if/invalidate-entire-instruction.yml b/spec/rtems/cache/if/invalidate-entire-instruction.yml
index 0610ff96..a36830c3 100644
--- a/spec/rtems/cache/if/invalidate-entire-instruction.yml
+++ b/spec/rtems/cache/if/invalidate-entire-instruction.yml
@@ -26,7 +26,5 @@ links:
 name: rtems_cache_invalidate_entire_instruction
 notes: null
 params: []
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/cache/if/invalidate-multiple-data-lines.yml b/spec/rtems/cache/if/invalidate-multiple-data-lines.yml
index d5710d6c..a6b77e02 100644
--- a/spec/rtems/cache/if/invalidate-multiple-data-lines.yml
+++ b/spec/rtems/cache/if/invalidate-multiple-data-lines.yml
@@ -42,7 +42,5 @@ params:
     is the size in bytes of the memory area to invalidate.
   dir: null
   name: size
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/cache/if/invalidate-multiple-instruction-lines.yml b/spec/rtems/cache/if/invalidate-multiple-instruction-lines.yml
index 52e40d3f..724ed031 100644
--- a/spec/rtems/cache/if/invalidate-multiple-instruction-lines.yml
+++ b/spec/rtems/cache/if/invalidate-multiple-instruction-lines.yml
@@ -40,7 +40,5 @@ params:
     is the size in bytes of the memory area to invalidate.
   dir: null
   name: size
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/cache/if/unfreeze-data.yml b/spec/rtems/cache/if/unfreeze-data.yml
index f62ddd65..269adc21 100644
--- a/spec/rtems/cache/if/unfreeze-data.yml
+++ b/spec/rtems/cache/if/unfreeze-data.yml
@@ -26,7 +26,5 @@ links:
 name: rtems_cache_unfreeze_data
 notes: null
 params: []
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/cache/if/unfreeze-instruction.yml b/spec/rtems/cache/if/unfreeze-instruction.yml
index f0d8a2f5..5caf92b3 100644
--- a/spec/rtems/cache/if/unfreeze-instruction.yml
+++ b/spec/rtems/cache/if/unfreeze-instruction.yml
@@ -26,7 +26,5 @@ links:
 name: rtems_cache_unfreeze_instruction
 notes: null
 params: []
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/clock/if/get-ticks-per-second-macro.yml b/spec/rtems/clock/if/get-ticks-per-second-macro.yml
index 377c18ec..3b5e5fb9 100644
--- a/spec/rtems/clock/if/get-ticks-per-second-macro.yml
+++ b/spec/rtems/clock/if/get-ticks-per-second-macro.yml
@@ -18,7 +18,5 @@ links:
 name: rtems_clock_get_ticks_per_second
 notes: null
 params: []
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/clock/if/get-ticks-since-boot-macro.yml b/spec/rtems/clock/if/get-ticks-since-boot-macro.yml
index f75693fa..48b2aff1 100644
--- a/spec/rtems/clock/if/get-ticks-since-boot-macro.yml
+++ b/spec/rtems/clock/if/get-ticks-since-boot-macro.yml
@@ -17,7 +17,5 @@ links:
 name: rtems_clock_get_ticks_since_boot
 notes: null
 params: []
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/clock/if/get-uptime-timeval.yml b/spec/rtems/clock/if/get-uptime-timeval.yml
index 1fdfeec9..0c310f32 100644
--- a/spec/rtems/clock/if/get-uptime-timeval.yml
+++ b/spec/rtems/clock/if/get-uptime-timeval.yml
@@ -39,7 +39,5 @@ params:
     pointer shall be valid, otherwise the behaviour is undefined.
   dir: out
   name: uptime
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/clock/if/tick.yml b/spec/rtems/clock/if/tick.yml
index f220bf0f..6c277265 100644
--- a/spec/rtems/clock/if/tick.yml
+++ b/spec/rtems/clock/if/tick.yml
@@ -23,7 +23,5 @@ notes: |
   The directive is a legacy interface.  It should not be called by applications
   directly.  A ${/glossary/clock-driver:/term} may call this directive.
 params: []
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/event/if/system-receive.yml b/spec/rtems/event/if/system-receive.yml
index 3a26e151..778a997a 100644
--- a/spec/rtems/event/if/system-receive.yml
+++ b/spec/rtems/event/if/system-receive.yml
@@ -53,7 +53,5 @@ params:
     in the referenced event set if the operation was successful.
   dir: null
   name: event_out
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/event/if/system-send.yml b/spec/rtems/event/if/system-send.yml
index abc91d10..96c4d828 100644
--- a/spec/rtems/event/if/system-send.yml
+++ b/spec/rtems/event/if/system-send.yml
@@ -39,7 +39,5 @@ params:
 - description: is the event set to send.
   dir: null
   name: event_in
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/event/if/transient-clear.yml b/spec/rtems/event/if/transient-clear.yml
index 2febcdcd..56a567e0 100644
--- a/spec/rtems/event/if/transient-clear.yml
+++ b/spec/rtems/event/if/transient-clear.yml
@@ -34,7 +34,5 @@ links:
 name: rtems_event_transient_clear
 notes: null
 params: []
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/event/if/transient-receive.yml b/spec/rtems/event/if/transient-receive.yml
index 41b2b18d..036d1a0b 100644
--- a/spec/rtems/event/if/transient-receive.yml
+++ b/spec/rtems/event/if/transient-receive.yml
@@ -42,7 +42,5 @@ params:
 - description: is the optional timeout in clock ticks.
   dir: null
   name: ticks
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/event/if/transient-send.yml b/spec/rtems/event/if/transient-send.yml
index a16b9736..38f10467 100644
--- a/spec/rtems/event/if/transient-send.yml
+++ b/spec/rtems/event/if/transient-send.yml
@@ -33,7 +33,5 @@ params:
 - description: is the identifier of the task to receive the transient event.
   dir: null
   name: id
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/fatal/if/error-occurred.yml b/spec/rtems/fatal/if/error-occurred.yml
index 98da1cf8..9c5e11e3 100644
--- a/spec/rtems/fatal/if/error-occurred.yml
+++ b/spec/rtems/fatal/if/error-occurred.yml
@@ -44,7 +44,5 @@ params:
     is the fatal code.
   dir: null
   name: fatal_code
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/fatal/if/exception-frame-print.yml b/spec/rtems/fatal/if/exception-frame-print.yml
index 653235df..d089be67 100644
--- a/spec/rtems/fatal/if/exception-frame-print.yml
+++ b/spec/rtems/fatal/if/exception-frame-print.yml
@@ -32,7 +32,5 @@ params:
     is the reference to the exception frame to print.
   dir: null
   name: frame
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/fatal/if/fatal.yml b/spec/rtems/fatal/if/fatal.yml
index 57a0d92d..8a400873 100644
--- a/spec/rtems/fatal/if/fatal.yml
+++ b/spec/rtems/fatal/if/fatal.yml
@@ -49,7 +49,5 @@ params:
     is the fatal code.
   dir: null
   name: fatal_code
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/fatal/if/panic.yml b/spec/rtems/fatal/if/panic.yml
index 931876b8..f8541158 100644
--- a/spec/rtems/fatal/if/panic.yml
+++ b/spec/rtems/fatal/if/panic.yml
@@ -50,7 +50,5 @@ params:
     is a list of optional parameters required by the message format.
   dir: null
   name: '...'
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/fatal/if/shutdown-executive.yml b/spec/rtems/fatal/if/shutdown-executive.yml
index b66884f5..19a6c539 100644
--- a/spec/rtems/fatal/if/shutdown-executive.yml
+++ b/spec/rtems/fatal/if/shutdown-executive.yml
@@ -42,7 +42,5 @@ params:
     is the fatal code.
   dir: null
   name: fatal_code
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/init/if/initialize-executive.yml b/spec/rtems/init/if/initialize-executive.yml
index 158bb0f8..360ebc54 100644
--- a/spec/rtems/init/if/initialize-executive.yml
+++ b/spec/rtems/init/if/initialize-executive.yml
@@ -32,7 +32,5 @@ notes: |
   Errors in the initialization sequence are usually fatal and lead to a system
   termination.
 params: []
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/intr/if/disable.yml b/spec/rtems/intr/if/disable.yml
index 08208e7d..8881fba5 100644
--- a/spec/rtems/intr/if/disable.yml
+++ b/spec/rtems/intr/if/disable.yml
@@ -73,7 +73,5 @@ params:
     previous interrupt level.
   dir: out
   name: _isr_cookie
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/intr/if/enable.yml b/spec/rtems/intr/if/enable.yml
index 97d7dbf4..398a6243 100644
--- a/spec/rtems/intr/if/enable.yml
+++ b/spec/rtems/intr/if/enable.yml
@@ -43,7 +43,5 @@ params:
     a previous call to ${disable:/name} or ${flash:/name}.
   dir: in
   name: _isr_cookie
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/intr/if/entry-initialize.yml b/spec/rtems/intr/if/entry-initialize.yml
index df966948..23bb6f34 100644
--- a/spec/rtems/intr/if/entry-initialize.yml
+++ b/spec/rtems/intr/if/entry-initialize.yml
@@ -52,7 +52,5 @@ params:
     is the descriptive information for the entry.
   dir: null
   name: info
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/intr/if/entry-initializer.yml b/spec/rtems/intr/if/entry-initializer.yml
index eadc174a..5188d6aa 100644
--- a/spec/rtems/intr/if/entry-initializer.yml
+++ b/spec/rtems/intr/if/entry-initializer.yml
@@ -33,7 +33,5 @@ params:
     is the descriptive information for the entry.
   dir: null
   name: _info
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/intr/if/flash.yml b/spec/rtems/intr/if/flash.yml
index 05e8ef76..fca060d1 100644
--- a/spec/rtems/intr/if/flash.yml
+++ b/spec/rtems/intr/if/flash.yml
@@ -29,19 +29,17 @@ links:
   uid: ../constraint/no-smp
 name: rtems_interrupt_flash
 notes: |
-    The ${.:/params[0]/name} parameter value must be obtained by a previous
-    call to ${disable:/name} or ${flash:/name}.  Using an otherwise obtained
-    value is undefined behaviour.
+  The ${.:/params[0]/name} parameter value must be obtained by a previous
+  call to ${disable:/name} or ${flash:/name}.  Using an otherwise obtained
+  value is undefined behaviour.
 
-    Historically, the interrupt flash directive was heavily used in the
-    operating system implementation.  However, this is no longer the case.  The
-    interrupt flash directive is provided for backward compatibility reasons.
+  Historically, the interrupt flash directive was heavily used in the
+  operating system implementation.  However, this is no longer the case.  The
+  interrupt flash directive is provided for backward compatibility reasons.
 params:
 - description: |
     is the previous interrupt level.
   dir: inout
   name: _isr_cookie
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/intr/if/local-disable.yml b/spec/rtems/intr/if/local-disable.yml
index baee1537..542ff14d 100644
--- a/spec/rtems/intr/if/local-disable.yml
+++ b/spec/rtems/intr/if/local-disable.yml
@@ -75,7 +75,5 @@ params:
     previous interrupt level.
   dir: out
   name: _isr_cookie
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/intr/if/local-enable.yml b/spec/rtems/intr/if/local-enable.yml
index da08a124..f1125d99 100644
--- a/spec/rtems/intr/if/local-enable.yml
+++ b/spec/rtems/intr/if/local-enable.yml
@@ -40,7 +40,5 @@ params:
     a previous call to ${local-disable:/name}.
   dir: in
   name: _isr_cookie
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/intr/if/lock-acquire-isr.yml b/spec/rtems/intr/if/lock-acquire-isr.yml
index fe0e03d4..14e1959a 100644
--- a/spec/rtems/intr/if/lock-acquire-isr.yml
+++ b/spec/rtems/intr/if/lock-acquire-isr.yml
@@ -56,7 +56,5 @@ params:
     lock by calling ${lock-release-isr:/name}.
   dir: out
   name: _lock_context
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/intr/if/lock-acquire.yml b/spec/rtems/intr/if/lock-acquire.yml
index 7c05fd94..cfca358b 100644
--- a/spec/rtems/intr/if/lock-acquire.yml
+++ b/spec/rtems/intr/if/lock-acquire.yml
@@ -63,7 +63,5 @@ params:
     lock by calling ${lock-release:/name}.
   dir: out
   name: _lock_context
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/intr/if/lock-declare.yml b/spec/rtems/intr/if/lock-declare.yml
index 3f42f2ea..987507a7 100644
--- a/spec/rtems/intr/if/lock-declare.yml
+++ b/spec/rtems/intr/if/lock-declare.yml
@@ -30,7 +30,5 @@ params:
     is the ISR lock object designator.
   dir: null
   name: _designator
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/intr/if/lock-define.yml b/spec/rtems/intr/if/lock-define.yml
index 378a1026..b8bdaa97 100644
--- a/spec/rtems/intr/if/lock-define.yml
+++ b/spec/rtems/intr/if/lock-define.yml
@@ -38,7 +38,5 @@ params:
     the system was built with profiling support enabled.
   dir: null
   name: _name
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/intr/if/lock-destroy.yml b/spec/rtems/intr/if/lock-destroy.yml
index d69da341..90282e9e 100644
--- a/spec/rtems/intr/if/lock-destroy.yml
+++ b/spec/rtems/intr/if/lock-destroy.yml
@@ -33,7 +33,5 @@ params:
     is the ISR lock to destroy.
   dir: inout
   name: _lock
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/intr/if/lock-initialize.yml b/spec/rtems/intr/if/lock-initialize.yml
index d9922e7f..a23c2718 100644
--- a/spec/rtems/intr/if/lock-initialize.yml
+++ b/spec/rtems/intr/if/lock-initialize.yml
@@ -31,7 +31,5 @@ params:
     the system was built with profiling support enabled.
   dir: null
   name: _name
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/intr/if/lock-initializer.yml b/spec/rtems/intr/if/lock-initializer.yml
index fb100549..89deb039 100644
--- a/spec/rtems/intr/if/lock-initializer.yml
+++ b/spec/rtems/intr/if/lock-initializer.yml
@@ -26,7 +26,5 @@ params:
     the system was built with profiling support enabled.
   dir: null
   name: _name
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/intr/if/lock-isr-disable.yml b/spec/rtems/intr/if/lock-isr-disable.yml
index acf184b3..3ecc3e1d 100644
--- a/spec/rtems/intr/if/lock-isr-disable.yml
+++ b/spec/rtems/intr/if/lock-isr-disable.yml
@@ -29,7 +29,5 @@ params:
     is the ISR lock context for an acquire and release pair.
   dir: out
   name: _lock_context
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/intr/if/lock-member.yml b/spec/rtems/intr/if/lock-member.yml
index a5035ef5..e093aec7 100644
--- a/spec/rtems/intr/if/lock-member.yml
+++ b/spec/rtems/intr/if/lock-member.yml
@@ -24,7 +24,5 @@ params:
     is the ISR lock member designator.
   dir: null
   name: _designator
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/intr/if/lock-reference.yml b/spec/rtems/intr/if/lock-reference.yml
index 3aa3f7e9..be2b16d9 100644
--- a/spec/rtems/intr/if/lock-reference.yml
+++ b/spec/rtems/intr/if/lock-reference.yml
@@ -29,7 +29,5 @@ params:
     is the target object to reference.
   dir: null
   name: _target
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/intr/if/lock-release-isr.yml b/spec/rtems/intr/if/lock-release-isr.yml
index d82a7d52..21f50623 100644
--- a/spec/rtems/intr/if/lock-release-isr.yml
+++ b/spec/rtems/intr/if/lock-release-isr.yml
@@ -46,7 +46,5 @@ params:
     the lock by calling ${lock-acquire-isr:/name}.
   dir: inout
   name: _lock_context
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/intr/if/lock-release.yml b/spec/rtems/intr/if/lock-release.yml
index f407413a..76ba5771 100644
--- a/spec/rtems/intr/if/lock-release.yml
+++ b/spec/rtems/intr/if/lock-release.yml
@@ -43,7 +43,5 @@ params:
     the lock by calling ${lock-acquire:/name}.
   dir: inout
   name: _lock_context
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/intr/if/server-action-prepend.yml b/spec/rtems/intr/if/server-action-prepend.yml
index 156b4389..c1fc68ef 100644
--- a/spec/rtems/intr/if/server-action-prepend.yml
+++ b/spec/rtems/intr/if/server-action-prepend.yml
@@ -52,8 +52,8 @@ params:
   dir: inout
   name: entry
 - description: |
-   is the interrupt server action to initialize and prepend to the list of
-   actions of the entry.
+    is the interrupt server action to initialize and prepend to the list of
+    actions of the entry.
   dir: out
   name: action
 - description: |
@@ -64,7 +64,5 @@ params:
     is the interrupt handler argument to set in the action.
   dir: null
   name: arg
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/intr/if/server-entry-destroy.yml b/spec/rtems/intr/if/server-entry-destroy.yml
index e4fa67cc..457933c3 100644
--- a/spec/rtems/intr/if/server-entry-destroy.yml
+++ b/spec/rtems/intr/if/server-entry-destroy.yml
@@ -36,7 +36,5 @@ params:
     is the interrupt server entry to destroy.
   dir: inout
   name: entry
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/intr/if/server-entry-submit.yml b/spec/rtems/intr/if/server-entry-submit.yml
index 88b61f1d..da415848 100644
--- a/spec/rtems/intr/if/server-entry-submit.yml
+++ b/spec/rtems/intr/if/server-entry-submit.yml
@@ -52,7 +52,5 @@ params:
     is the interrupt server entry to submit.
   dir: null
   name: entry
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/intr/if/server-request-destroy.yml b/spec/rtems/intr/if/server-request-destroy.yml
index 800d8e84..3975c88e 100644
--- a/spec/rtems/intr/if/server-request-destroy.yml
+++ b/spec/rtems/intr/if/server-request-destroy.yml
@@ -37,7 +37,5 @@ params:
     is the interrupt server request to destroy.
   dir: inout
   name: request
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/intr/if/server-request-set-vector.yml b/spec/rtems/intr/if/server-request-set-vector.yml
index c6c6465f..6f414193 100644
--- a/spec/rtems/intr/if/server-request-set-vector.yml
+++ b/spec/rtems/intr/if/server-request-set-vector.yml
@@ -56,7 +56,5 @@ params:
     is the interrupt vector number to be used by the request.
   dir: null
   name: vector
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/intr/if/server-request-submit.yml b/spec/rtems/intr/if/server-request-submit.yml
index aa526f0c..60b0094f 100644
--- a/spec/rtems/intr/if/server-request-submit.yml
+++ b/spec/rtems/intr/if/server-request-submit.yml
@@ -51,7 +51,5 @@ params:
     is the interrupt server request to submit.
   dir: inout
   name: request
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/io/if/put-char.yml b/spec/rtems/io/if/put-char.yml
index 614f7305..606dadaf 100644
--- a/spec/rtems/io/if/put-char.yml
+++ b/spec/rtems/io/if/put-char.yml
@@ -37,7 +37,5 @@ params:
     is an unused argument.
   dir: null
   name: unused
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/io/if/putc.yml b/spec/rtems/io/if/putc.yml
index c83cccb0..dd114e4f 100644
--- a/spec/rtems/io/if/putc.yml
+++ b/spec/rtems/io/if/putc.yml
@@ -39,7 +39,5 @@ params:
     is the character to output.
   dir: null
   name: c
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/message/if/buffer.yml b/spec/rtems/message/if/buffer.yml
index 89c2e5c0..3df7bd19 100644
--- a/spec/rtems/message/if/buffer.yml
+++ b/spec/rtems/message/if/buffer.yml
@@ -29,7 +29,5 @@ params:
     is the maximum message size in bytes.
   dir: null
   name: _maximum_message_size
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/mp/if/announce.yml b/spec/rtems/mp/if/announce.yml
index dfe88e9f..1dcbd8ac 100644
--- a/spec/rtems/mp/if/announce.yml
+++ b/spec/rtems/mp/if/announce.yml
@@ -37,7 +37,5 @@ notes: |
 
   This directive does not generate activity on remote nodes.
 params: []
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/object/if/build-id-macro.yml b/spec/rtems/object/if/build-id-macro.yml
index 1b09b90b..552fa70f 100644
--- a/spec/rtems/object/if/build-id-macro.yml
+++ b/spec/rtems/object/if/build-id-macro.yml
@@ -31,7 +31,5 @@ params:
 - description: null
   dir: null
   name: _index
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/object/if/build-name-macro.yml b/spec/rtems/object/if/build-name-macro.yml
index f924bfa7..eb84fea1 100644
--- a/spec/rtems/object/if/build-name-macro.yml
+++ b/spec/rtems/object/if/build-name-macro.yml
@@ -31,7 +31,5 @@ params:
 - description: null
   dir: null
   name: _c4
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/object/if/id-api-maximum-macro.yml b/spec/rtems/object/if/id-api-maximum-macro.yml
index 362febaf..5e0cffbb 100644
--- a/spec/rtems/object/if/id-api-maximum-macro.yml
+++ b/spec/rtems/object/if/id-api-maximum-macro.yml
@@ -18,7 +18,5 @@ links:
 name: rtems_object_id_api_maximum
 notes: null
 params: []
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/object/if/id-api-minimum-macro.yml b/spec/rtems/object/if/id-api-minimum-macro.yml
index b70af35c..896b54c4 100644
--- a/spec/rtems/object/if/id-api-minimum-macro.yml
+++ b/spec/rtems/object/if/id-api-minimum-macro.yml
@@ -18,7 +18,5 @@ links:
 name: rtems_object_id_api_minimum
 notes: null
 params: []
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/object/if/id-get-api-macro.yml b/spec/rtems/object/if/id-get-api-macro.yml
index 7de28b10..3abfa748 100644
--- a/spec/rtems/object/if/id-get-api-macro.yml
+++ b/spec/rtems/object/if/id-get-api-macro.yml
@@ -21,7 +21,5 @@ params:
 - description: null
   dir: null
   name: _id
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/object/if/id-get-class-macro.yml b/spec/rtems/object/if/id-get-class-macro.yml
index ff1b7e8f..a6451529 100644
--- a/spec/rtems/object/if/id-get-class-macro.yml
+++ b/spec/rtems/object/if/id-get-class-macro.yml
@@ -21,7 +21,5 @@ params:
 - description: null
   dir: null
   name: _id
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/object/if/id-get-index-macro.yml b/spec/rtems/object/if/id-get-index-macro.yml
index 02d90fbc..8ca8b952 100644
--- a/spec/rtems/object/if/id-get-index-macro.yml
+++ b/spec/rtems/object/if/id-get-index-macro.yml
@@ -21,7 +21,5 @@ params:
 - description: null
   dir: null
   name: _id
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/object/if/id-get-node-macro.yml b/spec/rtems/object/if/id-get-node-macro.yml
index 718998ae..01f004d6 100644
--- a/spec/rtems/object/if/id-get-node-macro.yml
+++ b/spec/rtems/object/if/id-get-node-macro.yml
@@ -21,7 +21,5 @@ params:
 - description: null
   dir: null
   name: _id
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/ratemon/if/report-statistics-with-plugin.yml b/spec/rtems/ratemon/if/report-statistics-with-plugin.yml
index d0627908..1638dd6d 100644
--- a/spec/rtems/ratemon/if/report-statistics-with-plugin.yml
+++ b/spec/rtems/ratemon/if/report-statistics-with-plugin.yml
@@ -36,7 +36,5 @@ params:
     is the printer plugin to output the report.
   dir: null
   name: printer
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/ratemon/if/report-statistics.yml b/spec/rtems/ratemon/if/report-statistics.yml
index 45683c32..4dab0392 100644
--- a/spec/rtems/ratemon/if/report-statistics.yml
+++ b/spec/rtems/ratemon/if/report-statistics.yml
@@ -31,7 +31,5 @@ links:
 name: rtems_rate_monotonic_report_statistics
 notes: null
 params: []
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/ratemon/if/reset-all-statistics.yml b/spec/rtems/ratemon/if/reset-all-statistics.yml
index 81eead70..e36103b7 100644
--- a/spec/rtems/ratemon/if/reset-all-statistics.yml
+++ b/spec/rtems/ratemon/if/reset-all-statistics.yml
@@ -30,7 +30,5 @@ links:
 name: rtems_rate_monotonic_reset_all_statistics
 notes: null
 params: []
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/scheduler/if/get-processor-macro.yml b/spec/rtems/scheduler/if/get-processor-macro.yml
index 34fcc024..08b809d5 100644
--- a/spec/rtems/scheduler/if/get-processor-macro.yml
+++ b/spec/rtems/scheduler/if/get-processor-macro.yml
@@ -17,7 +17,5 @@ links:
 name: rtems_scheduler_get_processor
 notes: null
 params: []
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/scheduler/if/get-processor-maximum-macro.yml b/spec/rtems/scheduler/if/get-processor-maximum-macro.yml
index 4f5c8119..4e40dab4 100644
--- a/spec/rtems/scheduler/if/get-processor-maximum-macro.yml
+++ b/spec/rtems/scheduler/if/get-processor-maximum-macro.yml
@@ -17,7 +17,5 @@ links:
 name: rtems_scheduler_get_processor_maximum
 notes: null
 params: []
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/support/if/name-to-characters.yml b/spec/rtems/support/if/name-to-characters.yml
index 99c01dc4..52ea2a40 100644
--- a/spec/rtems/support/if/name-to-characters.yml
+++ b/spec/rtems/support/if/name-to-characters.yml
@@ -51,7 +51,5 @@ params:
 - description: is the fourth character of the object name.
   dir: out
   name: c4
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/support/if/workspace-greedy-free.yml b/spec/rtems/support/if/workspace-greedy-free.yml
index 0a6b5920..f8067347 100644
--- a/spec/rtems/support/if/workspace-greedy-free.yml
+++ b/spec/rtems/support/if/workspace-greedy-free.yml
@@ -36,7 +36,5 @@ params:
     ${workspace-greedy-allocate-all-except-largest:/name}.
   dir: null
   name: opaque
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/task/if/exit.yml b/spec/rtems/task/if/exit.yml
index de6592d3..8c43d0d0 100644
--- a/spec/rtems/task/if/exit.yml
+++ b/spec/rtems/task/if/exit.yml
@@ -49,7 +49,5 @@ notes: |
         (void) pthread_exit( NULL);
       }
 params: []
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/rtems/task/if/iterate.yml b/spec/rtems/task/if/iterate.yml
index e6eed471..7f0542bf 100644
--- a/spec/rtems/task/if/iterate.yml
+++ b/spec/rtems/task/if/iterate.yml
@@ -49,7 +49,5 @@ params:
     iteration.
   dir: null
   name: arg
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/score/if/assert-unreachable.yml b/spec/score/if/assert-unreachable.yml
index 34472b67..60cd2a8a 100644
--- a/spec/score/if/assert-unreachable.yml
+++ b/spec/score/if/assert-unreachable.yml
@@ -21,7 +21,5 @@ links:
 name: _Assert_Unreachable
 notes: null
 params: []
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/score/if/dequalify-types-not-compatible.yml b/spec/score/if/dequalify-types-not-compatible.yml
index 9083b631..e66f1fca 100644
--- a/spec/score/if/dequalify-types-not-compatible.yml
+++ b/spec/score/if/dequalify-types-not-compatible.yml
@@ -31,7 +31,5 @@ links:
 name: RTEMS_DEQUALIFY_types_not_compatible
 notes: null
 params: []
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/score/if/maximum-priority.yml b/spec/score/if/maximum-priority.yml
index 45840f68..d58a4cd0 100644
--- a/spec/score/if/maximum-priority.yml
+++ b/spec/score/if/maximum-priority.yml
@@ -20,7 +20,5 @@ links:
 name: _RTEMS_Maximum_priority
 notes: null
 params: []
-return:
-  return: null
-  return-values: []
+return: null
 type: interface
diff --git a/spec/spec/interface-return-directive.yml b/spec/spec/interface-return-directive.yml
index 5fe3f6f7..a0bf9e07 100644
--- a/spec/spec/interface-return-directive.yml
+++ b/spec/spec/interface-return-directive.yml
@@ -20,6 +20,7 @@ spec-info:
     description: |
       This set of attributes specifies an interface return.
     mandatory-attributes: all
+  none: null
 spec-name: Interface Return Directive
 spec-type: interface-return-directive
 type: spec