software node: Introduce SOFTWARE_NODE_REFERENCE() helper macro

This is useful to assign software node reference with arguments
in a common way. Moreover, we have already couple of users that
may be converted. And by the fact, one of them is moved right here
to use the helper.

Tested-by: Daniel Scally <djrscally@gmail.com>
Reviewed-by: Daniel Scally <djrscally@gmail.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20210329151207.36619-5-andriy.shevchenko@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/base/test/property-entry-test.c b/drivers/base/test/property-entry-test.c
index 3a4f755c483c85d1067949c76b112dc479c14071..1106fedcceed88aad2e6fdb83eeff7c846b5a577 100644 (file)
--- a/drivers/base/test/property-entry-test.c
+++ b/drivers/base/test/property-entry-test.c
@@ -412,15 +412,8 @@ static void pe_test_reference(struct kunit *test)
        };
 
        static const struct software_node_ref_args refs[] = {
-               {
-                       .node = &nodes[0],
-                       .nargs = 0,
-               },
-               {
-                       .node = &nodes[1],
-                       .nargs = 2,
-                       .args = { 3, 4 },
-               },
+               SOFTWARE_NODE_REFERENCE(&nodes[0]),
+               SOFTWARE_NODE_REFERENCE(&nodes[1], 3, 4),
        };
 
        const struct property_entry entries[] = {

diff --git a/include/linux/property.h b/include/linux/property.h
index dd4687b562393120ebd029ecc2fb977c9535f0c3..0d876316e61d5df0f574e1b007f7f6f5fab42302 100644 (file)
--- a/include/linux/property.h
+++ b/include/linux/property.h
@@ -254,6 +254,13 @@ struct software_node_ref_args {
        u64 args[NR_FWNODE_REFERENCE_ARGS];
 };
 
+#define SOFTWARE_NODE_REFERENCE(_ref_, ...)                    \
+(const struct software_node_ref_args) {                                \
+       .node = _ref_,                                          \
+       .nargs = ARRAY_SIZE(((u64[]){ 0, ##__VA_ARGS__ })) - 1, \
+       .args = { __VA_ARGS__ },                                \
+}
+
 /**
  * struct property_entry - "Built-in" device property representation.
  * @name: Name of the property.
@@ -362,11 +369,7 @@ struct property_entry {
        .name = _name_,                                                 \
        .length = sizeof(struct software_node_ref_args),                \
        .type = DEV_PROP_REF,                                           \
-       { .pointer = &(const struct software_node_ref_args) {           \
-               .node = _ref_,                                          \
-               .nargs = ARRAY_SIZE(((u64[]){ 0, ##__VA_ARGS__ })) - 1, \
-               .args = { __VA_ARGS__ },                                \
-       } },                                                            \
+       { .pointer = &SOFTWARE_NODE_REFERENCE(_ref_, ##__VA_ARGS__), }, \
 }
 
 struct property_entry *