of: kunit: Extract some overlay boiler plate into macros

Make the lives of __of_overlay_apply_kunit() callers easier by
extracting some of the boiler plate involved in referencing the DT
overlays.

Cc: Brendan Higgins <brendan.higgins@linux.dev>
Cc: David Gow <davidgow@google.com>
Cc: Rae Moar <rmoar@google.com>
Cc: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Link: https://lore.kernel.org/r/20240822002433.1163814-3-sboyd@kernel.org

diff --git a/include/kunit/of.h b/include/kunit/of.h
index 48d4e70c9666b476976f5be77a71e7994c58f4f1..75a760a4e2a5d6e1753d2dd001a22af6b387ff62 100644 (file)
--- a/include/kunit/of.h
+++ b/include/kunit/of.h
@@ -62,6 +62,13 @@ static inline int __of_overlay_apply_kunit(struct kunit *test,
                                          &unused);
 }
 
+#define of_overlay_begin(overlay_name) __dtbo_##overlay_name##_begin
+#define of_overlay_end(overlay_name) __dtbo_##overlay_name##_end
+
+#define OF_OVERLAY_DECLARE(overlay_name)                       \
+       extern uint8_t of_overlay_begin(overlay_name)[];        \
+       extern uint8_t of_overlay_end(overlay_name)[]           \
+
 /**
  * of_overlay_apply_kunit() - Test managed of_overlay_fdt_apply() for built-in overlays
  * @test: test context
@@ -104,12 +111,11 @@ static inline int __of_overlay_apply_kunit(struct kunit *test,
  */
 #define of_overlay_apply_kunit(test, overlay_name)             \
 ({                                                             \
-       extern uint8_t __dtbo_##overlay_name##_begin[];         \
-       extern uint8_t __dtbo_##overlay_name##_end[];           \
+       OF_OVERLAY_DECLARE(overlay_name);                       \
                                                                \
        __of_overlay_apply_kunit((test),                        \
-                       __dtbo_##overlay_name##_begin,          \
-                       __dtbo_##overlay_name##_end);           \
+                       of_overlay_begin(overlay_name),         \
+                       of_overlay_end(overlay_name));          \
 })
 
 #endif