Skip to content

Commit

Permalink
include/linux/property.h: fix build issues with gcc-4.4.4
Browse files Browse the repository at this point in the history
gcc-4.4.4 has problems with initialization of anonymous unions:

drivers/mfd/intel-lpss-acpi.c:30: error: unknown field 'value' specified in initializer

work around this by crafting the initializers in a manner which the
compiler can handle.

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Andrew Morton authored and Rafael J. Wysocki committed Jan 1, 2016
1 parent 4c5301a commit d76eebf
Showing 1 changed file with 12 additions and 4 deletions.
16 changes: 12 additions & 4 deletions include/linux/property.h
Original file line number Diff line number Diff line change
Expand Up @@ -175,12 +175,19 @@ struct property_entry {
};
};

/*
* Note: the below four initializers for the anonymous union are carefully
* crafted to avoid gcc-4.4.4's problems with initialization of anon unions
* and structs.
*/

#define PROPERTY_ENTRY_INTEGER_ARRAY(_name_, _type_, _val_) \
{ \
.name = _name_, \
.length = ARRAY_SIZE(_val_) * sizeof(_type_), \
.is_array = true, \
.pointer._type_##_data = _val_, \
.is_string = false, \
{ .pointer = { _type_##_data = _val_ } }, \
}

#define PROPERTY_ENTRY_U8_ARRAY(_name_, _val_) \
Expand All @@ -198,14 +205,15 @@ struct property_entry {
.length = ARRAY_SIZE(_val_) * sizeof(const char *), \
.is_array = true, \
.is_string = true, \
.pointer.str = _val_, \
{ .pointer = { .str = _val_ } }, \
}

#define PROPERTY_ENTRY_INTEGER(_name_, _type_, _val_) \
{ \
.name = _name_, \
.length = sizeof(_type_), \
.value._type_##_data = _val_, \
.is_string = false, \
{ .value = { ._type_##_data = _val_ } }, \
}

#define PROPERTY_ENTRY_U8(_name_, _val_) \
Expand All @@ -222,7 +230,7 @@ struct property_entry {
.name = _name_, \
.length = sizeof(_val_), \
.is_string = true, \
.value.str = _val_, \
{ .value = {.str = _val_} }, \
}

#define PROPERTY_ENTRY_BOOL(_name_) \
Expand Down

0 comments on commit d76eebf

Please sign in to comment.