device property: Get rid of union aliasing

[platform/kernel/linux-rpi.git] / include / linux / property.h

diff --git a/include/linux/property.h b/include/linux/property.h
index 2eea4b3..ac8a1eb 100644 (file)
--- a/include/linux/property.h
+++ b/include/linux/property.h
@@ -178,7 +178,7 @@ static inline int fwnode_property_read_u64(const struct fwnode_handle *fwnode,
  * @name: Name of the property.
  * @length: Length of data making up the value.
  * @is_array: True when the property is an array.
- * @is_string: True when property is a string.
+ * @type: Type of the data in unions.
  * @pointer: Pointer to the property (an array of items of the given type).
  * @value: Value of the property (when it is a single item of the given type).
  */
@@ -186,10 +186,9 @@ struct property_entry {
        const char *name;
        size_t length;
        bool is_array;
-       bool is_string;
+       enum dev_prop_type type;
        union {
                union {
-                       const void *raw_data;
                        const u8 *u8_data;
                        const u16 *u16_data;
                        const u32 *u32_data;
@@ -197,7 +196,6 @@ struct property_entry {
                        const char * const *str;
                } pointer;
                union {
-                       unsigned long long raw_data;
                        u8 u8_data;
                        u16 u16_data;
                        u32 u32_data;
@@ -213,55 +211,55 @@ struct property_entry {
  * and structs.
  */
 
-#define PROPERTY_ENTRY_INTEGER_ARRAY(_name_, _type_, _val_)    \
-(struct property_entry) {                                      \
-       .name = _name_,                                         \
-       .length = ARRAY_SIZE(_val_) * sizeof(_type_),           \
-       .is_array = true,                                       \
-       .is_string = false,                                     \
-       { .pointer = { ._type_##_data = _val_ } },              \
+#define PROPERTY_ENTRY_INTEGER_ARRAY(_name_, _type_, _Type_, _val_)    \
+(struct property_entry) {                                              \
+       .name = _name_,                                                 \
+       .length = ARRAY_SIZE(_val_) * sizeof(_type_),                   \
+       .is_array = true,                                               \
+       .type = DEV_PROP_##_Type_,                                      \
+       { .pointer = { ._type_##_data = _val_ } },                      \
 }
 
 #define PROPERTY_ENTRY_U8_ARRAY(_name_, _val_)                 \
-       PROPERTY_ENTRY_INTEGER_ARRAY(_name_, u8, _val_)
+       PROPERTY_ENTRY_INTEGER_ARRAY(_name_, u8, U8, _val_)
 #define PROPERTY_ENTRY_U16_ARRAY(_name_, _val_)                        \
-       PROPERTY_ENTRY_INTEGER_ARRAY(_name_, u16, _val_)
+       PROPERTY_ENTRY_INTEGER_ARRAY(_name_, u16, U16, _val_)
 #define PROPERTY_ENTRY_U32_ARRAY(_name_, _val_)                        \
-       PROPERTY_ENTRY_INTEGER_ARRAY(_name_, u32, _val_)
+       PROPERTY_ENTRY_INTEGER_ARRAY(_name_, u32, U32, _val_)
 #define PROPERTY_ENTRY_U64_ARRAY(_name_, _val_)                        \
-       PROPERTY_ENTRY_INTEGER_ARRAY(_name_, u64, _val_)
+       PROPERTY_ENTRY_INTEGER_ARRAY(_name_, u64, U64, _val_)
 
 #define PROPERTY_ENTRY_STRING_ARRAY(_name_, _val_)             \
 (struct property_entry) {                                      \
        .name = _name_,                                         \
        .length = ARRAY_SIZE(_val_) * sizeof(const char *),     \
        .is_array = true,                                       \
-       .is_string = true,                                      \
+       .type = DEV_PROP_STRING,                                \
        { .pointer = { .str = _val_ } },                        \
 }
 
-#define PROPERTY_ENTRY_INTEGER(_name_, _type_, _val_)  \
-(struct property_entry) {                              \
-       .name = _name_,                                 \
-       .length = sizeof(_type_),                       \
-       .is_string = false,                             \
-       { .value = { ._type_##_data = _val_ } },        \
+#define PROPERTY_ENTRY_INTEGER(_name_, _type_, _Type_, _val_)  \
+(struct property_entry) {                                      \
+       .name = _name_,                                         \
+       .length = sizeof(_type_),                               \
+       .type = DEV_PROP_##_Type_,                              \
+       { .value = { ._type_##_data = _val_ } },                \
 }
 
 #define PROPERTY_ENTRY_U8(_name_, _val_)               \
-       PROPERTY_ENTRY_INTEGER(_name_, u8, _val_)
+       PROPERTY_ENTRY_INTEGER(_name_, u8, U8, _val_)
 #define PROPERTY_ENTRY_U16(_name_, _val_)              \
-       PROPERTY_ENTRY_INTEGER(_name_, u16, _val_)
+       PROPERTY_ENTRY_INTEGER(_name_, u16, U16, _val_)
 #define PROPERTY_ENTRY_U32(_name_, _val_)              \
-       PROPERTY_ENTRY_INTEGER(_name_, u32, _val_)
+       PROPERTY_ENTRY_INTEGER(_name_, u32, U32, _val_)
 #define PROPERTY_ENTRY_U64(_name_, _val_)              \
-       PROPERTY_ENTRY_INTEGER(_name_, u64, _val_)
+       PROPERTY_ENTRY_INTEGER(_name_, u64, U64, _val_)
 
 #define PROPERTY_ENTRY_STRING(_name_, _val_)           \
 (struct property_entry) {                              \
        .name = _name_,                                 \
        .length = sizeof(_val_),                        \
-       .is_string = true,                              \
+       .type = DEV_PROP_STRING,                        \
        { .value = { .str = _val_ } },                  \
 }