Sometimes we want to initialize property entry array from a regular
pointer, when we can't determine length automatically via ARRAY_SIZE.
Let's introduce PROPERTY_ENTRY_ARRAY_XXX_LEN macros that take explicit
"len" argument.

Signed-off-by: Dmitry Torokhov <dmitry.torok...@gmail.com>
---
 include/linux/property.h | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/include/linux/property.h b/include/linux/property.h
index 911ace267247..793d05cbc3b2 100644
--- a/include/linux/property.h
+++ b/include/linux/property.h
@@ -280,6 +280,25 @@ struct property_entry {
 #define PROPERTY_ENTRY_STRING_ARRAY(_name_, _val_)                     \
        PROPERTY_ENTRY_ARRAY(_name_, str, STRING, _val_)
 
+#define PROPERTY_ENTRY_ARRAY_LEN(_name_, _elem_, _Type_, _val_, _len_) \
+(struct property_entry) {                                              \
+       .name = _name_,                                                 \
+       .length = (_len_) * PROPERTY_ENTRY_ELSIZE(_elem_),      \
+       .type = DEV_PROP_##_Type_,                                      \
+       .pointer._elem_ = _val_,                                        \
+}
+
+#define PROPERTY_ENTRY_U8_ARRAY_LEN(_name_, _val_, _len_)              \
+       PROPERTY_ENTRY_ARRAY_LEN(_name_, u8_data, U8, _val_, _len_)
+#define PROPERTY_ENTRY_U16_ARRAY_LEN(_name_, _val_, _len_)             \
+       PROPERTY_ENTRY_ARRAY_LEN(_name_, u16_data, U16, _val_, _len_)
+#define PROPERTY_ENTRY_U32_ARRAY_LEN(_name_, _val_, _len_)             \
+       PROPERTY_ENTRY_ARRAY_LEN(_name_, u32_data, U32, _val_, _len_)
+#define PROPERTY_ENTRY_U64_ARRAY_LEN(_name_, _val_, _len_)             \
+       PROPERTY_ENTRY_ARRAY_LEN(_name_, u64_data, U64, _val_, _len_)
+#define PROPERTY_ENTRY_STRING_ARRAY_LEN(_name_, _val_, _len_)          \
+       PROPERTY_ENTRY_ARRAY_LEN(_name_, str, STRING, _val_, _len_)
+
 #define PROPERTY_ENTRY_ELEMENT(_name_, _elem_, _Type_, _val_)  \
 (struct property_entry) {                                      \
        .name = _name_,                                         \
-- 
2.23.0.187.g17f5b7556c-goog

Reply via email to