| Message ID | 20191011230721.206646-3-dmitry.torokhov@gmail.com (mailing list archive) |
|---|---|
| State | Deferred, archived |
| Headers | show |
| Series | software node: add support for reference properties | expand |
On Fri, Oct 11, 2019 at 04:07:09PM -0700, Dmitry Torokhov wrote: > 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. Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> > --- > include/linux/property.h | 45 +++++++++++++++++++++++++--------------- > 1 file changed, 28 insertions(+), 17 deletions(-) > > diff --git a/include/linux/property.h b/include/linux/property.h > index 44c1704f7163..f89b930ca4b7 100644 > --- a/include/linux/property.h > +++ b/include/linux/property.h > @@ -256,33 +256,44 @@ struct property_entry { > * and structs. > */ > > -#define PROPERTY_ENTRY_INTEGER_ARRAY(_name_, _type_, _Type_, _val_) \ > +#define PROPERTY_ENTRY_ARRAY_LEN(_name_, _type_, _Type_, _val_, _len_) \ > (struct property_entry) { \ > .name = _name_, \ > - .length = ARRAY_SIZE(_val_) * sizeof(_type_), \ > + .length = (_len_) * 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, U8, _val_) > -#define PROPERTY_ENTRY_U16_ARRAY(_name_, _val_) \ > - PROPERTY_ENTRY_INTEGER_ARRAY(_name_, u16, U16, _val_) > -#define PROPERTY_ENTRY_U32_ARRAY(_name_, _val_) \ > - PROPERTY_ENTRY_INTEGER_ARRAY(_name_, u32, U32, _val_) > -#define PROPERTY_ENTRY_U64_ARRAY(_name_, _val_) \ > - PROPERTY_ENTRY_INTEGER_ARRAY(_name_, u64, U64, _val_) > +#define PROPERTY_ENTRY_U8_ARRAY_LEN(_name_, _val_, _len_) \ > + PROPERTY_ENTRY_ARRAY_LEN(_name_, u8, U8, _val_, _len_) > +#define PROPERTY_ENTRY_U16_ARRAY_LEN(_name_, _val_, _len_) \ > + PROPERTY_ENTRY_ARRAY_LEN(_name_, u16, U16, _val_, _len_) > +#define PROPERTY_ENTRY_U32_ARRAY_LEN(_name_, _val_, _len_) \ > + PROPERTY_ENTRY_ARRAY_LEN(_name_, u32, U32, _val_, _len_) > +#define PROPERTY_ENTRY_U64_ARRAY_LEN(_name_, _val_, _len_) \ > + PROPERTY_ENTRY_ARRAY_LEN(_name_, u64, U64, _val_, _len_) > > -#define PROPERTY_ENTRY_STRING_ARRAY(_name_, _val_) \ > -(struct property_entry) { \ > - .name = _name_, \ > - .length = ARRAY_SIZE(_val_) * sizeof(const char *), \ > - .is_array = true, \ > - .type = DEV_PROP_STRING, \ > - { .pointer = { .str = _val_ } }, \ > +#define PROPERTY_ENTRY_STRING_ARRAY_LEN(_name_, _val_, _len_) \ > +(struct property_entry) { \ > + .name = _name_, \ > + .length = (_len_) * sizeof(const char *), \ > + .is_array = true, \ > + .type = DEV_PROP_STRING, \ > + { .pointer = { .str = _val_ } }, \ > } > > +#define PROPERTY_ENTRY_U8_ARRAY(_name_, _val_) \ > + PROPERTY_ENTRY_U8_ARRAY_LEN(_name_, _val_, ARRAY_SIZE(_val_)) > +#define PROPERTY_ENTRY_U16_ARRAY(_name_, _val_) \ > + PROPERTY_ENTRY_U16_ARRAY_LEN(_name_, _val_, ARRAY_SIZE(_val_)) > +#define PROPERTY_ENTRY_U32_ARRAY(_name_, _val_) \ > + PROPERTY_ENTRY_U32_ARRAY_LEN(_name_, _val_, ARRAY_SIZE(_val_)) > +#define PROPERTY_ENTRY_U64_ARRAY(_name_, _val_) \ > + PROPERTY_ENTRY_U64_ARRAY_LEN(_name_, _val_, ARRAY_SIZE(_val_)) > +#define PROPERTY_ENTRY_STRING_ARRAY(_name_, _val_) \ > + PROPERTY_ENTRY_STRING_ARRAY_LEN(_name_, _val_, ARRAY_SIZE(_val_)) > + > #define PROPERTY_ENTRY_INTEGER(_name_, _type_, _Type_, _val_) \ > (struct property_entry) { \ > .name = _name_, \ > -- > 2.23.0.700.g56cf767bdb-goog >
diff --git a/include/linux/property.h b/include/linux/property.h index 44c1704f7163..f89b930ca4b7 100644 --- a/include/linux/property.h +++ b/include/linux/property.h @@ -256,33 +256,44 @@ struct property_entry { * and structs. */ -#define PROPERTY_ENTRY_INTEGER_ARRAY(_name_, _type_, _Type_, _val_) \ +#define PROPERTY_ENTRY_ARRAY_LEN(_name_, _type_, _Type_, _val_, _len_) \ (struct property_entry) { \ .name = _name_, \ - .length = ARRAY_SIZE(_val_) * sizeof(_type_), \ + .length = (_len_) * 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, U8, _val_) -#define PROPERTY_ENTRY_U16_ARRAY(_name_, _val_) \ - PROPERTY_ENTRY_INTEGER_ARRAY(_name_, u16, U16, _val_) -#define PROPERTY_ENTRY_U32_ARRAY(_name_, _val_) \ - PROPERTY_ENTRY_INTEGER_ARRAY(_name_, u32, U32, _val_) -#define PROPERTY_ENTRY_U64_ARRAY(_name_, _val_) \ - PROPERTY_ENTRY_INTEGER_ARRAY(_name_, u64, U64, _val_) +#define PROPERTY_ENTRY_U8_ARRAY_LEN(_name_, _val_, _len_) \ + PROPERTY_ENTRY_ARRAY_LEN(_name_, u8, U8, _val_, _len_) +#define PROPERTY_ENTRY_U16_ARRAY_LEN(_name_, _val_, _len_) \ + PROPERTY_ENTRY_ARRAY_LEN(_name_, u16, U16, _val_, _len_) +#define PROPERTY_ENTRY_U32_ARRAY_LEN(_name_, _val_, _len_) \ + PROPERTY_ENTRY_ARRAY_LEN(_name_, u32, U32, _val_, _len_) +#define PROPERTY_ENTRY_U64_ARRAY_LEN(_name_, _val_, _len_) \ + PROPERTY_ENTRY_ARRAY_LEN(_name_, u64, U64, _val_, _len_) -#define PROPERTY_ENTRY_STRING_ARRAY(_name_, _val_) \ -(struct property_entry) { \ - .name = _name_, \ - .length = ARRAY_SIZE(_val_) * sizeof(const char *), \ - .is_array = true, \ - .type = DEV_PROP_STRING, \ - { .pointer = { .str = _val_ } }, \ +#define PROPERTY_ENTRY_STRING_ARRAY_LEN(_name_, _val_, _len_) \ +(struct property_entry) { \ + .name = _name_, \ + .length = (_len_) * sizeof(const char *), \ + .is_array = true, \ + .type = DEV_PROP_STRING, \ + { .pointer = { .str = _val_ } }, \ } +#define PROPERTY_ENTRY_U8_ARRAY(_name_, _val_) \ + PROPERTY_ENTRY_U8_ARRAY_LEN(_name_, _val_, ARRAY_SIZE(_val_)) +#define PROPERTY_ENTRY_U16_ARRAY(_name_, _val_) \ + PROPERTY_ENTRY_U16_ARRAY_LEN(_name_, _val_, ARRAY_SIZE(_val_)) +#define PROPERTY_ENTRY_U32_ARRAY(_name_, _val_) \ + PROPERTY_ENTRY_U32_ARRAY_LEN(_name_, _val_, ARRAY_SIZE(_val_)) +#define PROPERTY_ENTRY_U64_ARRAY(_name_, _val_) \ + PROPERTY_ENTRY_U64_ARRAY_LEN(_name_, _val_, ARRAY_SIZE(_val_)) +#define PROPERTY_ENTRY_STRING_ARRAY(_name_, _val_) \ + PROPERTY_ENTRY_STRING_ARRAY_LEN(_name_, _val_, ARRAY_SIZE(_val_)) + #define PROPERTY_ENTRY_INTEGER(_name_, _type_, _Type_, _val_) \ (struct property_entry) { \ .name = _name_, \
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.torokhov@gmail.com> --- include/linux/property.h | 45 +++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 17 deletions(-)