mfd: Use of_property_read_bool() for boolean properties

PATCH Applied Rob Herring 2 participants 2 messages Mar 10, 2023 – Mar 16, 2023

Subsystems (2)

Multifunction devices (MFD) Wolfson microelectronics drivers

lore

Share & tools

lore

Rob Herring

author

2023-03-10 14:49 UTC #0 lore raw

PATCH 1/1 mfd: Use of_property_read_bool() for boolean properties

It is preferred to use typed property access functions (i.e. of_property_read_<type> functions) rather than low-level of_get_property/of_find_property functions for reading properties. Convert reading boolean properties to to of_property_read_bool().

Signed-off-by Rob Herring <[email protected]>

---
 drivers/mfd/88pm860x-core.c |  3 +--
 drivers/mfd/wm8994-core.c   | 19 +++++--------------
 2 files changed, 6 insertions(+), 16 deletions(-)

drivers/mfd/88pm860x-core.c +1 -2

index 6ba7169cb953..581d4d6a785d 100644
@@ -1117,8 +1117,7 @@ static int pm860x_dt_init(struct device_node *np,
 {
 	int ret;
 
-	if (of_get_property(np, "marvell,88pm860x-irq-read-clr", NULL))
-		pdata->irq_mode = 1;
+	pdata->irq_mode = of_property_read_bool(np, "marvell,88pm860x-irq-read-clr");
 	ret = of_property_read_u32(np, "marvell,88pm860x-slave-addr",
 				   &pdata->companion_addr);
 	if (ret) {

drivers/mfd/wm8994-core.c +5 ~~-14~~

index a89221bffde5..c419ab0c0eae 100644
@@ -279,20 +279,11 @@ static int wm8994_set_pdata_from_of(struct wm8994 *wm8994)
 	of_property_read_u32_array(np, "wlf,micbias-cfg", pdata->micbias,
 				   ARRAY_SIZE(pdata->micbias));
 
-	pdata->lineout1_diff = true;
-	pdata->lineout2_diff = true;
-	if (of_find_property(np, "wlf,lineout1-se", NULL))
-		pdata->lineout1_diff = false;
-	if (of_find_property(np, "wlf,lineout2-se", NULL))
-		pdata->lineout2_diff = false;
-
-	if (of_find_property(np, "wlf,lineout1-feedback", NULL))
-		pdata->lineout1fb = true;
-	if (of_find_property(np, "wlf,lineout2-feedback", NULL))
-		pdata->lineout2fb = true;
-
-	if (of_find_property(np, "wlf,ldoena-always-driven", NULL))
-		pdata->lineout2fb = true;
+	pdata->lineout1_diff = !of_property_read_bool(np, "wlf,lineout1-se");
+	pdata->lineout2_diff = !of_property_read_bool(np, "wlf,lineout2-se");
+	pdata->lineout1fb = of_property_read_bool(np, "wlf,lineout1-feedback");
+	pdata->lineout2fb = of_property_read_bool(np, "wlf,lineout2-feedback") ||
+		of_property_read_bool(np, "wlf,ldoena-always-driven");
 
 	pdata->spkmode_pu = of_property_read_bool(np, "wlf,spkmode-pu");

Signature · 1 line

2.39.2

Lee Jones

maintainer Applied

2023-03-16 15:54 UTC #1 lore raw

Quoted 10 lines · Rob Herring

It is preferred to use typed property access functions (i.e. of_property_read_<type> functions) rather than low-level of_get_property/of_find_property functions for reading properties. Convert reading boolean properties to to of_property_read_bool().
Signed-off-by Rob Herring <[email protected]>
---
 drivers/mfd/88pm860x-core.c |  3 +--
 drivers/mfd/wm8994-core.c   | 19 +++++--------------
 2 files changed, 6 insertions(+), 16 deletions(-)

Applied, thanks

--
Lee Jones [李琼斯]