Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1557459 > unrolled thread

[PATCH 0/4] mfd: max77686: Remove unneeded non-OF code in driver

Started byJavier Martinez Canillas <javier@osg.samsung.com>
First post2017-01-12 14:50 +0100
Last post2017-01-12 17:40 +0100
Articles 8 — 3 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH 0/4] mfd: max77686: Remove unneeded non-OF code in driver Javier Martinez Canillas <javier@osg.samsung.com> - 2017-01-12 14:50 +0100
    [PATCH 4/4] mfd: max77686: Remove I2C device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-01-12 14:50 +0100
      Re: [PATCH 4/4] mfd: max77686: Remove I2C device ID table Krzysztof Kozlowski <krzk@kernel.org> - 2017-01-13 14:20 +0100
    [PATCH 1/4] mfd: max77686: Don't attempt to get i2c_device_id .data Javier Martinez Canillas <javier@osg.samsung.com> - 2017-01-12 14:50 +0100
      Re: [PATCH 1/4] mfd: max77686: Don't attempt to get i2c_device_id  .data Krzysztof Kozlowski <krzk@kernel.org> - 2017-01-13 14:00 +0100
    [PATCH 3/4] mfd: max77686: Use the struct i2c_driver .probe_new instead of .probe Javier Martinez Canillas <javier@osg.samsung.com> - 2017-01-12 14:50 +0100
      Re: [PATCH 3/4] mfd: max77686: Use the struct i2c_driver .probe_new  instead of .probe Krzysztof Kozlowski <krzk@kernel.org> - 2017-01-13 14:20 +0100
    Re: [PATCH 0/4] mfd: max77686: Remove unneeded non-OF code in driver Laxman Dewangan <ldewangan@nvidia.com> - 2017-01-12 17:40 +0100

#1557459 — [PATCH 0/4] mfd: max77686: Remove unneeded non-OF code in driver

FromJavier Martinez Canillas <javier@osg.samsung.com>
Date2017-01-12 14:50 +0100
Subject[PATCH 0/4] mfd: max77686: Remove unneeded non-OF code in driver
Message-ID<sYNVn-4Au-7@gated-at.bofh.it>
Hello Lee,

This series contains cleanups for the max77686 PMIC MFD driver.
The driver is only used in DT platforms and so all the code
related with the i2c_device_id table can be removed.

Best regards,
Javier


Javier Martinez Canillas (4):
  mfd: max77686: Don't attempt to get i2c_device_id .data
  mfd: max77686: Use of_device_get_match_data() helper
  mfd: max77686: Use the struct i2c_driver .probe_new instead of .probe
  mfd: max77686: Remove I2C device ID table

 drivers/mfd/max77686.c | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

-- 
2.7.4

[toc] | [next] | [standalone]


#1557462 — [PATCH 4/4] mfd: max77686: Remove I2C device ID table

FromJavier Martinez Canillas <javier@osg.samsung.com>
Date2017-01-12 14:50 +0100
Subject[PATCH 4/4] mfd: max77686: Remove I2C device ID table
Message-ID<sYNVo-4Au-21@gated-at.bofh.it>
In reply to#1557459
The driver is only used in DT platforms so there's no need to
have an i2c_device_id table.

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

---

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

diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c
index 896c1bf85acc..b0e8e13c0049 100644
--- a/drivers/mfd/max77686.c
+++ b/drivers/mfd/max77686.c
@@ -241,13 +241,6 @@ static int max77686_i2c_probe(struct i2c_client *i2c)
 	return 0;
 }
 
-static const struct i2c_device_id max77686_i2c_id[] = {
-	{ "max77686", TYPE_MAX77686 },
-	{ "max77802", TYPE_MAX77802 },
-	{ }
-};
-MODULE_DEVICE_TABLE(i2c, max77686_i2c_id);
-
 #ifdef CONFIG_PM_SLEEP
 static int max77686_suspend(struct device *dev)
 {
@@ -294,7 +287,6 @@ static struct i2c_driver max77686_i2c_driver = {
 		   .of_match_table = of_match_ptr(max77686_pmic_dt_match),
 	},
 	.probe_new = max77686_i2c_probe,
-	.id_table = max77686_i2c_id,
 };
 
 module_i2c_driver(max77686_i2c_driver);
-- 
2.7.4

[toc] | [prev] | [next] | [standalone]


#1558398 — Re: [PATCH 4/4] mfd: max77686: Remove I2C device ID table

FromKrzysztof Kozlowski <krzk@kernel.org>
Date2017-01-13 14:20 +0100
SubjectRe: [PATCH 4/4] mfd: max77686: Remove I2C device ID table
Message-ID<sZ9VU-1kp-37@gated-at.bofh.it>
In reply to#1557462
On Thu, Jan 12, 2017 at 10:47:37AM -0300, Javier Martinez Canillas wrote:
> The driver is only used in DT platforms so there's no need to
> have an i2c_device_id table.
> 
> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
> 
> ---
> 
>  drivers/mfd/max77686.c | 8 --------
>  1 file changed, 8 deletions(-)
> 

Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
Tested-by: Krzysztof Kozlowski <krzk@kernel.org>

Best regards,
Krzysztof

[toc] | [prev] | [next] | [standalone]


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

FromJavier Martinez Canillas <javier@osg.samsung.com>
Date2017-01-12 14:50 +0100
Subject[PATCH 1/4] mfd: max77686: Don't attempt to get i2c_device_id .data
Message-ID<sYNVo-4Au-29@gated-at.bofh.it>
In reply to#1557459
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>
---

 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

[toc] | [prev] | [next] | [standalone]


#1558386 — Re: [PATCH 1/4] mfd: max77686: Don't attempt to get i2c_device_id .data

FromKrzysztof Kozlowski <krzk@kernel.org>
Date2017-01-13 14:00 +0100
SubjectRe: [PATCH 1/4] mfd: max77686: Don't attempt to get i2c_device_id .data
Message-ID<sZ9Cy-Ys-9@gated-at.bofh.it>
In reply to#1557463
On Thu, Jan 12, 2017 at 10:47:34AM -0300, Javier Martinez Canillas wrote:
> 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>
> ---
> 
>  drivers/mfd/max77686.c | 13 +++++--------
>  1 file changed, 5 insertions(+), 8 deletions(-)
> 

Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
Tested-by: Krzysztof Kozlowski <krzk@kernel.org>

Best regards,
Krzysztof

[toc] | [prev] | [next] | [standalone]


#1557464 — [PATCH 3/4] mfd: max77686: Use the struct i2c_driver .probe_new instead of .probe

FromJavier Martinez Canillas <javier@osg.samsung.com>
Date2017-01-12 14:50 +0100
Subject[PATCH 3/4] mfd: max77686: Use the struct i2c_driver .probe_new instead of .probe
Message-ID<sYNVo-4Au-27@gated-at.bofh.it>
In reply to#1557459
If a driver is only used in DT platforms, there's no need to get the
i2c_device_id as an argument of the probe function. Since this data
can be get from the matching of_device_id.

There's a temporary .probe_new field in struct i2c_driver that can be
used as probe callback for the case when i2c_device_id won't be used.

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

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

diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c
index 33dd09493605..896c1bf85acc 100644
--- a/drivers/mfd/max77686.c
+++ b/drivers/mfd/max77686.c
@@ -172,8 +172,7 @@ static const struct of_device_id max77686_pmic_dt_match[] = {
 };
 MODULE_DEVICE_TABLE(of, max77686_pmic_dt_match);
 
-static int max77686_i2c_probe(struct i2c_client *i2c,
-			      const struct i2c_device_id *id)
+static int max77686_i2c_probe(struct i2c_client *i2c)
 {
 	struct max77686_dev *max77686 = NULL;
 	unsigned int data;
@@ -294,7 +293,7 @@ static struct i2c_driver max77686_i2c_driver = {
 		   .pm = &max77686_pm,
 		   .of_match_table = of_match_ptr(max77686_pmic_dt_match),
 	},
-	.probe = max77686_i2c_probe,
+	.probe_new = max77686_i2c_probe,
 	.id_table = max77686_i2c_id,
 };
 
-- 
2.7.4

[toc] | [prev] | [next] | [standalone]


#1558393 — Re: [PATCH 3/4] mfd: max77686: Use the struct i2c_driver .probe_new instead of .probe

FromKrzysztof Kozlowski <krzk@kernel.org>
Date2017-01-13 14:20 +0100
SubjectRe: [PATCH 3/4] mfd: max77686: Use the struct i2c_driver .probe_new instead of .probe
Message-ID<sZ9VT-1kp-13@gated-at.bofh.it>
In reply to#1557464
On Thu, Jan 12, 2017 at 10:47:36AM -0300, Javier Martinez Canillas wrote:
> If a driver is only used in DT platforms, there's no need to get the
> i2c_device_id as an argument of the probe function. Since this data
> can be get from the matching of_device_id.
> 
> There's a temporary .probe_new field in struct i2c_driver that can be
> used as probe callback for the case when i2c_device_id won't be used.
> 
> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
> ---
> 
>  drivers/mfd/max77686.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)

Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
Tested-by: Krzysztof Kozlowski <krzk@kernel.org>

Best regards,
Krzysztof

[toc] | [prev] | [next] | [standalone]


#1557583

FromLaxman Dewangan <ldewangan@nvidia.com>
Date2017-01-12 17:40 +0100
Message-ID<sYQzU-6d7-21@gated-at.bofh.it>
In reply to#1557459
On Thursday 12 January 2017 07:17 PM, Javier Martinez Canillas wrote:
> Hello Lee,
>
> This series contains cleanups for the max77686 PMIC MFD driver.
> The driver is only used in DT platforms and so all the code
> related with the i2c_device_id table can be removed.
>
> Best regards,
> Javier
>
>

LGTM, let me also review the max77620 on similar cleanups.

Acked-by: Laxman Dewangan <ldewangan@nvidia.com>

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web