[PATCH v2 1/4] mfd: max77686: Don't attempt to get i2c_device_id .data

From	Javier Martinez Canillas <javier@osg.samsung.com>
Newsgroups	linux.kernel
Subject	[PATCH v2 1/4] mfd: max77686: Don't attempt to get i2c_device_id .data
Date	2017-01-13 14:40 +0100
Message-ID	<sZaff-1qE-5@gated-at.bofh.it> (permalink)
References	<sZaff-1qE-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

The driver is only used in platforms that have DT support so always the
I2C device .data will be get from the matched OF node and never will be
from the I2C device ID table.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Acked-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
Tested-by: Krzysztof Kozlowski <krzk@kernel.org>

---

Changes in v2:
- Add Laxman's Acked-by tag to patch 1/4.
- Add Krzysztof's Reviewed-by and Tested-by tags to patch 1/4.

 drivers/mfd/max77686.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c
index 7b68ed72e9cb..ddae3bf3e46c 100644
--- a/drivers/mfd/max77686.c
+++ b/drivers/mfd/max77686.c
@@ -188,14 +188,11 @@ static int max77686_i2c_probe(struct i2c_client *i2c,
 	if (!max77686)
 		return -ENOMEM;
 
-	if (i2c->dev.of_node) {
-		match = of_match_node(max77686_pmic_dt_match, i2c->dev.of_node);
-		if (!match)
-			return -EINVAL;
-
-		max77686->type = (unsigned long)match->data;
-	} else
-		max77686->type = id->driver_data;
+	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->dev = &i2c->dev;
-- 
2.7.4

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 1/4] mfd: max77686: Don't attempt to get i2c_device_id .data Javier Martinez Canillas <javier@osg.samsung.com> - 2017-01-13 14:40 +0100
  Re: [PATCH v2 1/4] mfd: max77686: Don't attempt to get i2c_device_id  .data Chanwoo Choi <cw00.choi@samsung.com> - 2017-01-16 07:40 +0100

csiph-web