software node: allow passing reference args to PROPERTY_ENTRY_REF()
When dynamically creating software nodes and properties for subsequent use with software_node_register() current implementation of PROPERTY_ENTRY_REF() is not suitable because it creates a temporary instance of struct software_node_ref_args on stack which will later disappear, and software_node_register() only does shallow copy of properties. Fix this by allowing to pass address of reference arguments structure directly into PROPERTY_ENTRY_REF(), so that caller can manage lifetime of the object properly. Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Link: https://patch.msgid.link/aiTo4dvKu8pyimHA@google.com Signed-off-by: Danilo Krummrich <dakr@kernel.org>
This commit is contained in:
1 parent
a7a7dc5c46
commit
fe221742e3
1 file changed
+7
-1
@@ -471,12 +471,18 @@ struct property_entry {
|
|||||||
#define PROPERTY_ENTRY_STRING(_name_, _val_) \
|
#define PROPERTY_ENTRY_STRING(_name_, _val_) \
|
||||||
__PROPERTY_ENTRY_ELEMENT(_name_, str, STRING, _val_)
|
__PROPERTY_ENTRY_ELEMENT(_name_, str, STRING, _val_)
|
||||||
|
|
||||||
|
#define __PROPERTY_ENTRY_REF_ARGS(_ref_, ...) \
|
||||||
|
_Generic(_ref_, \
|
||||||
|
const struct software_node_ref_args *: _ref_, \
|
||||||
|
struct software_node_ref_args *: _ref_, \
|
||||||
|
default: &SOFTWARE_NODE_REFERENCE(_ref_, ##__VA_ARGS__))
|
||||||
|
|
||||||
#define PROPERTY_ENTRY_REF(_name_, _ref_, ...) \
|
#define PROPERTY_ENTRY_REF(_name_, _ref_, ...) \
|
||||||
(struct property_entry) { \
|
(struct property_entry) { \
|
||||||
.name = _name_, \
|
.name = _name_, \
|
||||||
.length = sizeof(struct software_node_ref_args), \
|
.length = sizeof(struct software_node_ref_args), \
|
||||||
.type = DEV_PROP_REF, \
|
.type = DEV_PROP_REF, \
|
||||||
{ .pointer = &SOFTWARE_NODE_REFERENCE(_ref_, ##__VA_ARGS__), }, \
|
{ .pointer = __PROPERTY_ENTRY_REF_ARGS(_ref_, ##__VA_ARGS__) }, \
|
||||||
}
|
}
|
||||||
|
|
||||||
#define PROPERTY_ENTRY_BOOL(_name_) \
|
#define PROPERTY_ENTRY_BOOL(_name_) \
|
||||||
|
|||||||
Reference in new issue
Block a user