* [PATCH v3 1/3] device property: Get rid of __PROPERTY_ENTRY_ARRAY_EL*SIZE*()
@ 2022-11-11 15:46 Andy Shevchenko
2022-11-11 15:46 ` [PATCH v3 2/3] device property: Move PROPERTY_ENTRY_BOOL() a bit down Andy Shevchenko
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Andy Shevchenko @ 2022-11-11 15:46 UTC (permalink / raw)
To: Andy Shevchenko, linux-kernel, linux-acpi
Cc: Greg Kroah-Hartman, Rafael J. Wysocki, Daniel Scally,
Heikki Krogerus, Sakari Ailus
First of all, _ELEMENT_SIZE() repeats existing sizeof_field() macro.
Second, usage of _ARRAY_ELSIZE_LEN() adds unnecessary indirection
to the data layout. It's more understandable when the data structure
is placed explicitly. That said, get rid of those macros by replacing
them with the existing helper and explicit data structure layout.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v3: fixed typo in PROPERTY_ENTRY_REF_ARRAY_LEN() impl (LKP)
v2: rebased on latest Linux Next, fixed anon union assignment
include/linux/property.h | 34 ++++++++++++++--------------------
1 file changed, 14 insertions(+), 20 deletions(-)
diff --git a/include/linux/property.h b/include/linux/property.h
index 5d840299146d..0eab13a5c7df 100644
--- a/include/linux/property.h
+++ b/include/linux/property.h
@@ -12,6 +12,7 @@
#include <linux/bits.h>
#include <linux/fwnode.h>
+#include <linux/stddef.h>
#include <linux/types.h>
struct device;
@@ -311,24 +312,14 @@ struct property_entry {
* crafted to avoid gcc-4.4.4's problems with initialization of anon unions
* and structs.
*/
-
-#define __PROPERTY_ENTRY_ELEMENT_SIZE(_elem_) \
- sizeof(((struct property_entry *)NULL)->value._elem_[0])
-
-#define __PROPERTY_ENTRY_ARRAY_ELSIZE_LEN(_name_, _elsize_, _Type_, \
- _val_, _len_) \
-(struct property_entry) { \
- .name = _name_, \
- .length = (_len_) * (_elsize_), \
- .type = DEV_PROP_##_Type_, \
- { .pointer = _val_ }, \
+#define __PROPERTY_ENTRY_ARRAY_LEN(_name_, _elem_, _Type_, _val_, _len_) \
+(struct property_entry) { \
+ .name = _name_, \
+ .length = (_len_) * sizeof_field(struct property_entry, value._elem_[0]), \
+ .type = DEV_PROP_##_Type_, \
+ { .pointer = _val_ }, \
}
-#define __PROPERTY_ENTRY_ARRAY_LEN(_name_, _elem_, _Type_, _val_, _len_)\
- __PROPERTY_ENTRY_ARRAY_ELSIZE_LEN(_name_, \
- __PROPERTY_ENTRY_ELEMENT_SIZE(_elem_), \
- _Type_, _val_, _len_)
-
#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_) \
@@ -340,9 +331,12 @@ struct property_entry {
#define PROPERTY_ENTRY_STRING_ARRAY_LEN(_name_, _val_, _len_) \
__PROPERTY_ENTRY_ARRAY_LEN(_name_, str, STRING, _val_, _len_)
#define PROPERTY_ENTRY_REF_ARRAY_LEN(_name_, _val_, _len_) \
- __PROPERTY_ENTRY_ARRAY_ELSIZE_LEN(_name_, \
- sizeof(struct software_node_ref_args), \
- REF, _val_, _len_)
+(struct property_entry) { \
+ .name = _name_, \
+ .length = (_len_) * sizeof(struct software_node_ref_args), \
+ .type = DEV_PROP_REF, \
+ { .pointer = _val_ }, \
+}
#define PROPERTY_ENTRY_U8_ARRAY(_name_, _val_) \
PROPERTY_ENTRY_U8_ARRAY_LEN(_name_, _val_, ARRAY_SIZE(_val_))
@@ -360,7 +354,7 @@ struct property_entry {
#define __PROPERTY_ENTRY_ELEMENT(_name_, _elem_, _Type_, _val_) \
(struct property_entry) { \
.name = _name_, \
- .length = __PROPERTY_ENTRY_ELEMENT_SIZE(_elem_), \
+ .length = sizeof_field(struct property_entry, value._elem_[0]), \
.is_inline = true, \
.type = DEV_PROP_##_Type_, \
{ .value = { ._elem_[0] = _val_ } }, \
--
2.35.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH v3 2/3] device property: Move PROPERTY_ENTRY_BOOL() a bit down
2022-11-11 15:46 [PATCH v3 1/3] device property: Get rid of __PROPERTY_ENTRY_ARRAY_EL*SIZE*() Andy Shevchenko
@ 2022-11-11 15:46 ` Andy Shevchenko
2022-11-11 15:46 ` [PATCH v3 3/3] device property: Add a blank line in Kconfig of tests Andy Shevchenko
2022-11-22 13:11 ` [PATCH v3 1/3] device property: Get rid of __PROPERTY_ENTRY_ARRAY_EL*SIZE*() Heikki Krogerus
2 siblings, 0 replies; 4+ messages in thread
From: Andy Shevchenko @ 2022-11-11 15:46 UTC (permalink / raw)
To: Andy Shevchenko, linux-kernel, linux-acpi
Cc: Greg Kroah-Hartman, Rafael J. Wysocki, Daniel Scally,
Heikki Krogerus, Sakari Ailus
Let's order ARRAY and non-ARRAY macros in the same way. The
PROPERTY_ENTRY_BOOL() is special, move it a bit down in the
code so it won't break ordering of the rest.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v3: no changes
v2: rebased on latest Linux Next
include/linux/property.h | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/include/linux/property.h b/include/linux/property.h
index 0eab13a5c7df..8b4d2d9deea5 100644
--- a/include/linux/property.h
+++ b/include/linux/property.h
@@ -330,6 +330,7 @@ struct property_entry {
__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_REF_ARRAY_LEN(_name_, _val_, _len_) \
(struct property_entry) { \
.name = _name_, \
@@ -371,12 +372,6 @@ struct property_entry {
#define PROPERTY_ENTRY_STRING(_name_, _val_) \
__PROPERTY_ENTRY_ELEMENT(_name_, str, STRING, _val_)
-#define PROPERTY_ENTRY_BOOL(_name_) \
-(struct property_entry) { \
- .name = _name_, \
- .is_inline = true, \
-}
-
#define PROPERTY_ENTRY_REF(_name_, _ref_, ...) \
(struct property_entry) { \
.name = _name_, \
@@ -385,9 +380,14 @@ struct property_entry {
{ .pointer = &SOFTWARE_NODE_REFERENCE(_ref_, ##__VA_ARGS__), }, \
}
+#define PROPERTY_ENTRY_BOOL(_name_) \
+(struct property_entry) { \
+ .name = _name_, \
+ .is_inline = true, \
+}
+
struct property_entry *
property_entries_dup(const struct property_entry *properties);
-
void property_entries_free(const struct property_entry *properties);
bool device_dma_supported(const struct device *dev);
--
2.35.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH v3 3/3] device property: Add a blank line in Kconfig of tests
2022-11-11 15:46 [PATCH v3 1/3] device property: Get rid of __PROPERTY_ENTRY_ARRAY_EL*SIZE*() Andy Shevchenko
2022-11-11 15:46 ` [PATCH v3 2/3] device property: Move PROPERTY_ENTRY_BOOL() a bit down Andy Shevchenko
@ 2022-11-11 15:46 ` Andy Shevchenko
2022-11-22 13:11 ` [PATCH v3 1/3] device property: Get rid of __PROPERTY_ENTRY_ARRAY_EL*SIZE*() Heikki Krogerus
2 siblings, 0 replies; 4+ messages in thread
From: Andy Shevchenko @ 2022-11-11 15:46 UTC (permalink / raw)
To: Andy Shevchenko, linux-kernel, linux-acpi
Cc: Greg Kroah-Hartman, Rafael J. Wysocki, Daniel Scally,
Heikki Krogerus, Sakari Ailus
Seems the blank line to separate entries in Kconfig was missing.
Add it.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v3: new patch
drivers/base/test/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/base/test/Kconfig b/drivers/base/test/Kconfig
index 2f3fa31a948e..610a1ba7a467 100644
--- a/drivers/base/test/Kconfig
+++ b/drivers/base/test/Kconfig
@@ -8,6 +8,7 @@ config TEST_ASYNC_DRIVER_PROBE
The module name will be test_async_driver_probe.ko
If unsure say N.
+
config DRIVER_PE_KUNIT_TEST
bool "KUnit Tests for property entry API" if !KUNIT_ALL_TESTS
depends on KUNIT=y
--
2.35.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v3 1/3] device property: Get rid of __PROPERTY_ENTRY_ARRAY_EL*SIZE*()
2022-11-11 15:46 [PATCH v3 1/3] device property: Get rid of __PROPERTY_ENTRY_ARRAY_EL*SIZE*() Andy Shevchenko
2022-11-11 15:46 ` [PATCH v3 2/3] device property: Move PROPERTY_ENTRY_BOOL() a bit down Andy Shevchenko
2022-11-11 15:46 ` [PATCH v3 3/3] device property: Add a blank line in Kconfig of tests Andy Shevchenko
@ 2022-11-22 13:11 ` Heikki Krogerus
2 siblings, 0 replies; 4+ messages in thread
From: Heikki Krogerus @ 2022-11-22 13:11 UTC (permalink / raw)
To: Andy Shevchenko
Cc: linux-kernel, linux-acpi, Greg Kroah-Hartman, Rafael J. Wysocki,
Daniel Scally, Sakari Ailus
On Fri, Nov 11, 2022 at 05:46:19PM +0200, Andy Shevchenko wrote:
> First of all, _ELEMENT_SIZE() repeats existing sizeof_field() macro.
> Second, usage of _ARRAY_ELSIZE_LEN() adds unnecessary indirection
> to the data layout. It's more understandable when the data structure
> is placed explicitly. That said, get rid of those macros by replacing
> them with the existing helper and explicit data structure layout.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
For the series:
Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> ---
> v3: fixed typo in PROPERTY_ENTRY_REF_ARRAY_LEN() impl (LKP)
> v2: rebased on latest Linux Next, fixed anon union assignment
> include/linux/property.h | 34 ++++++++++++++--------------------
> 1 file changed, 14 insertions(+), 20 deletions(-)
>
> diff --git a/include/linux/property.h b/include/linux/property.h
> index 5d840299146d..0eab13a5c7df 100644
> --- a/include/linux/property.h
> +++ b/include/linux/property.h
> @@ -12,6 +12,7 @@
>
> #include <linux/bits.h>
> #include <linux/fwnode.h>
> +#include <linux/stddef.h>
> #include <linux/types.h>
>
> struct device;
> @@ -311,24 +312,14 @@ struct property_entry {
> * crafted to avoid gcc-4.4.4's problems with initialization of anon unions
> * and structs.
> */
> -
> -#define __PROPERTY_ENTRY_ELEMENT_SIZE(_elem_) \
> - sizeof(((struct property_entry *)NULL)->value._elem_[0])
> -
> -#define __PROPERTY_ENTRY_ARRAY_ELSIZE_LEN(_name_, _elsize_, _Type_, \
> - _val_, _len_) \
> -(struct property_entry) { \
> - .name = _name_, \
> - .length = (_len_) * (_elsize_), \
> - .type = DEV_PROP_##_Type_, \
> - { .pointer = _val_ }, \
> +#define __PROPERTY_ENTRY_ARRAY_LEN(_name_, _elem_, _Type_, _val_, _len_) \
> +(struct property_entry) { \
> + .name = _name_, \
> + .length = (_len_) * sizeof_field(struct property_entry, value._elem_[0]), \
> + .type = DEV_PROP_##_Type_, \
> + { .pointer = _val_ }, \
> }
>
> -#define __PROPERTY_ENTRY_ARRAY_LEN(_name_, _elem_, _Type_, _val_, _len_)\
> - __PROPERTY_ENTRY_ARRAY_ELSIZE_LEN(_name_, \
> - __PROPERTY_ENTRY_ELEMENT_SIZE(_elem_), \
> - _Type_, _val_, _len_)
> -
> #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_) \
> @@ -340,9 +331,12 @@ struct property_entry {
> #define PROPERTY_ENTRY_STRING_ARRAY_LEN(_name_, _val_, _len_) \
> __PROPERTY_ENTRY_ARRAY_LEN(_name_, str, STRING, _val_, _len_)
> #define PROPERTY_ENTRY_REF_ARRAY_LEN(_name_, _val_, _len_) \
> - __PROPERTY_ENTRY_ARRAY_ELSIZE_LEN(_name_, \
> - sizeof(struct software_node_ref_args), \
> - REF, _val_, _len_)
> +(struct property_entry) { \
> + .name = _name_, \
> + .length = (_len_) * sizeof(struct software_node_ref_args), \
> + .type = DEV_PROP_REF, \
> + { .pointer = _val_ }, \
> +}
>
> #define PROPERTY_ENTRY_U8_ARRAY(_name_, _val_) \
> PROPERTY_ENTRY_U8_ARRAY_LEN(_name_, _val_, ARRAY_SIZE(_val_))
> @@ -360,7 +354,7 @@ struct property_entry {
> #define __PROPERTY_ENTRY_ELEMENT(_name_, _elem_, _Type_, _val_) \
> (struct property_entry) { \
> .name = _name_, \
> - .length = __PROPERTY_ENTRY_ELEMENT_SIZE(_elem_), \
> + .length = sizeof_field(struct property_entry, value._elem_[0]), \
> .is_inline = true, \
> .type = DEV_PROP_##_Type_, \
> { .value = { ._elem_[0] = _val_ } }, \
> --
> 2.35.1
--
heikki
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-11-22 13:11 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-11 15:46 [PATCH v3 1/3] device property: Get rid of __PROPERTY_ENTRY_ARRAY_EL*SIZE*() Andy Shevchenko
2022-11-11 15:46 ` [PATCH v3 2/3] device property: Move PROPERTY_ENTRY_BOOL() a bit down Andy Shevchenko
2022-11-11 15:46 ` [PATCH v3 3/3] device property: Add a blank line in Kconfig of tests Andy Shevchenko
2022-11-22 13:11 ` [PATCH v3 1/3] device property: Get rid of __PROPERTY_ENTRY_ARRAY_EL*SIZE*() Heikki Krogerus
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox