On Fri, Oct 11, 2019 at 04:07:11PM -0700, Dmitry Torokhov wrote:
> Let's mark PROPERTY_ENTRY_* macros that are internal with double leading
> underscores so users are not tempted to use them.
We may undef them at the end of file, right?
>
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
> ---
> include/linux/property.h | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/include/linux/property.h b/include/linux/property.h
> index f89b930ca4b7..2c9d4d209296 100644
> --- a/include/linux/property.h
> +++ b/include/linux/property.h
> @@ -256,7 +256,7 @@ struct property_entry {
> * and structs.
> */
>
> -#define PROPERTY_ENTRY_ARRAY_LEN(_name_, _type_, _Type_, _val_, _len_) \
> +#define __PROPERTY_ENTRY_ARRAY_LEN(_name_, _type_, _Type_, _val_, _len_)\
> (struct property_entry) { \
> .name = _name_, \
> .length = (_len_) * sizeof(_type_), \
> @@ -266,13 +266,13 @@ struct property_entry {
> }
>
> #define PROPERTY_ENTRY_U8_ARRAY_LEN(_name_, _val_, _len_) \
> - PROPERTY_ENTRY_ARRAY_LEN(_name_, u8, U8, _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_)
> + __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_)
> + __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_)
> + __PROPERTY_ENTRY_ARRAY_LEN(_name_, u64, U64, _val_, _len_)
>
> #define PROPERTY_ENTRY_STRING_ARRAY_LEN(_name_, _val_, _len_) \
> (struct property_entry) { \
> @@ -294,7 +294,7 @@ struct property_entry {
> #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_) \
> +#define __PROPERTY_ENTRY_INTEGER(_name_, _type_, _Type_, _val_) \
> (struct property_entry) { \
> .name = _name_, \
> .length = sizeof(_type_), \
> @@ -303,13 +303,13 @@ struct property_entry {
> }
>
> #define PROPERTY_ENTRY_U8(_name_, _val_) \
> - PROPERTY_ENTRY_INTEGER(_name_, u8, U8, _val_)
> + __PROPERTY_ENTRY_INTEGER(_name_, u8, U8, _val_)
> #define PROPERTY_ENTRY_U16(_name_, _val_) \
> - PROPERTY_ENTRY_INTEGER(_name_, u16, U16, _val_)
> + __PROPERTY_ENTRY_INTEGER(_name_, u16, U16, _val_)
> #define PROPERTY_ENTRY_U32(_name_, _val_) \
> - PROPERTY_ENTRY_INTEGER(_name_, u32, U32, _val_)
> + __PROPERTY_ENTRY_INTEGER(_name_, u32, U32, _val_)
> #define PROPERTY_ENTRY_U64(_name_, _val_) \
> - PROPERTY_ENTRY_INTEGER(_name_, u64, U64, _val_)
> + __PROPERTY_ENTRY_INTEGER(_name_, u64, U64, _val_)
>
> #define PROPERTY_ENTRY_STRING(_name_, _val_) \
> (struct property_entry) { \
> --
> 2.23.0.700.g56cf767bdb-goog
>
--
With Best Regards,
Andy Shevchenko
