[PATCH v2 1/7] mfd: max8997: Simplify getting of_device_id match data

* [PATCH v2 1/7] mfd: max8997: Simplify getting of_device_id match data
@ 2021-04-20 11:39 Krzysztof Kozlowski
  2021-04-20 11:39 ` [PATCH v2 2/7] mfd: max8998: " Krzysztof Kozlowski
                   ` (5 more replies)
  0 siblings, 6 replies; 9+ messages in thread
From: Krzysztof Kozlowski @ 2021-04-20 11:39 UTC (permalink / raw)
  To: Support Opensource, Lee Jones, Krzysztof Kozlowski,
	Bartlomiej Zolnierkiewicz, Tony Lindgren, linux-kernel,
	linux-samsung-soc, linux-omap, patches
  Cc: Marek Szyprowski, Sylwester Nawrocki

Use of_device_get_match_data() to make the code slightly smaller.  There
is also no need to wrap it in a check for CONFIG_OF, because dev.of_node
will be set only with OF support.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>

---

Changes since v1:
1. Remove check for CONFIG_OF
---
 drivers/mfd/max8997.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/mfd/max8997.c b/drivers/mfd/max8997.c
index 68d8f2b95287..2141de78115d 100644
--- a/drivers/mfd/max8997.c
+++ b/drivers/mfd/max8997.c
@@ -11,6 +11,7 @@
 #include <linux/slab.h>
 #include <linux/i2c.h>
 #include <linux/of.h>
+#include <linux/of_device.h>
 #include <linux/of_irq.h>
 #include <linux/interrupt.h>
 #include <linux/pm_runtime.h>
@@ -145,11 +146,9 @@ static struct max8997_platform_data *max8997_i2c_parse_dt_pdata(
 static inline unsigned long max8997_i2c_get_driver_data(struct i2c_client *i2c,
 						const struct i2c_device_id *id)
 {
-	if (IS_ENABLED(CONFIG_OF) && i2c->dev.of_node) {
-		const struct of_device_id *match;
-		match = of_match_node(max8997_pmic_dt_match, i2c->dev.of_node);
-		return (unsigned long)match->data;
-	}
+	if (i2c->dev.of_node)
+		return (unsigned long)of_device_get_match_data(&i2c->dev);
+
 	return id->driver_data;
 }
 
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 9+ messages in thread