mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Javier Martinez Canillas <javier@osg.samsung.com>
To: linux-kernel@vger.kernel.org
Cc: Laxman Dewangan <ldewangan@nvidia.com>,
	Javier Martinez Canillas <javier@osg.samsung.com>,
	Krzysztof Kozlowski <krzk@kernel.org>,
	Chanwoo Choi <cw00.choi@samsung.com>,
	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
	Lee Jones <lee.jones@linaro.org>
Subject: [PATCH 2/4] mfd: max77686: Use of_device_get_match_data() helper
Date: Thu, 12 Jan 2017 10:47:35 -0300	[thread overview]
Message-ID: <1484228857-20182-3-git-send-email-javier@osg.samsung.com> (raw)
In-Reply-To: <1484228857-20182-1-git-send-email-javier@osg.samsung.com>

Use the generic helper to get the matched of_device_id .data,
instead of open coding it.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
---

 drivers/mfd/max77686.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c
index ddae3bf3e46c..33dd09493605 100644
--- a/drivers/mfd/max77686.c
+++ b/drivers/mfd/max77686.c
@@ -34,6 +34,7 @@
 #include <linux/mfd/max77686-private.h>
 #include <linux/err.h>
 #include <linux/of.h>
+#include <linux/of_device.h>
 
 static const struct mfd_cell max77686_devs[] = {
 	{ .name = "max77686-pmic", },
@@ -175,7 +176,6 @@ static int max77686_i2c_probe(struct i2c_client *i2c,
 			      const struct i2c_device_id *id)
 {
 	struct max77686_dev *max77686 = NULL;
-	const struct of_device_id *match;
 	unsigned int data;
 	int ret = 0;
 	const struct regmap_config *config;
@@ -188,13 +188,8 @@ static int max77686_i2c_probe(struct i2c_client *i2c,
 	if (!max77686)
 		return -ENOMEM;
 
-	match = of_match_node(max77686_pmic_dt_match, i2c->dev.of_node);
-	if (!match)
-		return -EINVAL;
-
-	max77686->type = (unsigned long)match->data;
-
 	i2c_set_clientdata(i2c, max77686);
+	max77686->type = (unsigned long)of_device_get_match_data(&i2c->dev);
 	max77686->dev = &i2c->dev;
 	max77686->i2c = i2c;
 
-- 
2.7.4

  parent reply	other threads:[~2017-01-12 13:48 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-12 13:47 [PATCH 0/4] mfd: max77686: Remove unneeded non-OF code in driver Javier Martinez Canillas
2017-01-12 13:47 ` [PATCH 1/4] mfd: max77686: Don't attempt to get i2c_device_id .data Javier Martinez Canillas
2017-01-13 12:56   ` Krzysztof Kozlowski
2017-01-23 11:32   ` Lee Jones
2017-01-12 13:47 ` Javier Martinez Canillas [this message]
2017-01-13 13:04   ` [PATCH 2/4] mfd: max77686: Use of_device_get_match_data() helper Krzysztof Kozlowski
2017-01-13 13:12     ` Javier Martinez Canillas
2017-01-12 13:47 ` [PATCH 3/4] mfd: max77686: Use the struct i2c_driver .probe_new instead of .probe Javier Martinez Canillas
2017-01-13 13:11   ` Krzysztof Kozlowski
2017-01-12 13:47 ` [PATCH 4/4] mfd: max77686: Remove I2C device ID table Javier Martinez Canillas
2017-01-13 13:13   ` Krzysztof Kozlowski
2017-01-12 16:22 ` [PATCH 0/4] mfd: max77686: Remove unneeded non-OF code in driver Laxman Dewangan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1484228857-20182-3-git-send-email-javier@osg.samsung.com \
    --to=javier@osg.samsung.com \
    --cc=b.zolnierkie@samsung.com \
    --cc=cw00.choi@samsung.com \
    --cc=krzk@kernel.org \
    --cc=ldewangan@nvidia.com \
    --cc=lee.jones@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®