Skip to contentSkip to conversation

regulator: tps65218: Add terminate entry for of_device_id table

PATCH In review Axel Lin 2 participants 5 messages Feb 19, 2014

Subsystems (2)
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH v2 1/3 regulator: tps65218: Add terminate entry for of_device_id table

Fixes below build error:
FATAL: drivers/regulator/tps65218-regulator: struct of_device_id is not terminated with a NULL entry!

---
I'm sorry that I just found I CC wrong developers in my previous mail. So here is a resend.

 drivers/regulator/tps65218-regulator.c | 1 +
 1 file changed, 1 insertion(+)
drivers/regulator/tps65218-regulator.c +1 -0
index 958276c..d1c7831 100644
@@ -96,6 +96,7 @@ static const struct of_device_id tps65218_of_match[] = {
 	TPS65218_OF_MATCH("ti,tps65218-dcdc5", tps65218_pmic_regs[DCDC5]),
 	TPS65218_OF_MATCH("ti,tps65218-dcdc6", tps65218_pmic_regs[DCDC6]),
 	TPS65218_OF_MATCH("ti,tps65218-ldo1", tps65218_pmic_regs[LDO1]),
+	{ }
 };
 MODULE_DEVICE_TABLE(of, tps65218_of_match);
 
Signature · 1 line
1.8.1.2
author
#1 lore raw

PATCH v2 2/3 regulator: tps65218: Remove unnecessary regulator_unregister call

Current code uses devm_regulator_register() so the we don't need to explicitly call regulator_unregister() in .remove.
And then we don't need to save rdev pointer to tps->rdev[id].

---
 drivers/regulator/tps65218-regulator.c | 18 ------------------
 1 file changed, 18 deletions(-)
drivers/regulator/tps65218-regulator.c +0 -18
index d1c7831..1fb1db5 100644
@@ -267,23 +267,6 @@ static int tps65218_regulator_probe(struct platform_device *pdev)
 		return PTR_ERR(rdev);
 	}
 
-	/* Save regulator */
-	tps->rdev[id] = rdev;
-
-	return 0;
-}
-
-static int tps65218_regulator_remove(struct platform_device *pdev)
-{
-	struct tps65218 *tps = platform_get_drvdata(pdev);
-	const struct of_device_id	*match;
-	const struct tps_info		*template;
-
-	match = of_match_device(tps65218_of_match, &pdev->dev);
-	template = match->data;
-	regulator_unregister(tps->rdev[template->id]);
-	platform_set_drvdata(pdev, NULL);
-
 	return 0;
 }
 
@@ -294,7 +277,6 @@ static struct platform_driver tps65218_regulator_driver = {
 		.of_match_table = of_match_ptr(tps65218_of_match),
 	},
 	.probe = tps65218_regulator_probe,
-	.remove = tps65218_regulator_remove,
 };
 
 module_platform_driver(tps65218_regulator_driver);
Signature · 1 line
1.8.1.2
author
#3 lore raw

PATCH v2 3/3 regulator: tps65218: Add OF dependency

In reply to Axel Lin

This is a DT-only driver, so make it depend on OF and remove of_match_ptr in the code.

---
 drivers/regulator/Kconfig              |  2 +-
 drivers/regulator/tps65218-regulator.c | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)
drivers/regulator/Kconfig +1 -1
index b05da880..b7c95e8 100644
@@ -515,7 +515,7 @@ config REGULATOR_TPS65217
 
 config REGULATOR_TPS65218
 	tristate "TI TPS65218 Power regulators"
-	depends on MFD_TPS65218
+	depends on MFD_TPS65218 && OF
 	help
 	  This driver supports TPS65218 voltage regulator chips. TPS65218
 	  provides six step-down converters and one general-purpose LDO
drivers/regulator/tps65218-regulator.c +6 -8
index 1fb1db5..cec72fa 100644
@@ -243,14 +243,12 @@ static int tps65218_regulator_probe(struct platform_device *pdev)
 	int id;
 
 	match = of_match_device(tps65218_of_match, &pdev->dev);
-	if (match) {
-		template = match->data;
-		id = template->id;
-		init_data = of_get_regulator_init_data(&pdev->dev,
-						      pdev->dev.of_node);
-	} else {
+	if (!match)
 		return -ENODEV;
-	}
+
+	template = match->data;
+	id = template->id;
+	init_data = of_get_regulator_init_data(&pdev->dev, pdev->dev.of_node);
 
 	platform_set_drvdata(pdev, tps);
 
@@ -274,7 +272,7 @@ static struct platform_driver tps65218_regulator_driver = {
 	.driver = {
 		.name = "tps65218-pmic",
 		.owner = THIS_MODULE,
-		.of_match_table = of_match_ptr(tps65218_of_match),
+		.of_match_table = tps65218_of_match,
 	},
 	.probe = tps65218_regulator_probe,
 };
Signature · 1 line
1.8.1.2
Acked-by on v2 1/3
#4 lore raw
In reply to Axel Lin
Quoted 15 lines · Axel Lin

Fixes below build error:
FATAL: drivers/regulator/tps65218-regulator: struct of_device_id is not terminated with a NULL entry!

---
I'm sorry that I just found I CC wrong developers in my previous mail. So here is a resend.

  drivers/regulator/tps65218-regulator.c | 1 +
  1 file changed, 1 insertion(+)
drivers/regulator/tps65218-regulator.c +0 -0
index 958276c..d1c7831 100644

drivers/regulator/tps65218-regulator.c static const struct of_device_id tps65218_of_match[] = { · line 101

Quoted 6 lines
drivers/regulator/tps65218-regulator.c +1 -0
@@ -96,6 +96,7 @@ static const struct of_device_id tps65218_of_match[] = {
  	TPS65218_OF_MATCH("ti,tps65218-dcdc5", tps65218_pmic_regs[DCDC5]),
  	TPS65218_OF_MATCH("ti,tps65218-dcdc6", tps65218_pmic_regs[DCDC6]),
  	TPS65218_OF_MATCH("ti,tps65218-ldo1", tps65218_pmic_regs[LDO1]),
+	{ }
  };
  MODULE_DEVICE_TABLE(of, tps65218_of_match);

Thanks

Quoted 1 line
Acked-by on v2 2/3
#2 lore raw

Re: [PATCH 2/3 v2] regulator: tps65218: Remove unnecessary regulator_unregister call

In reply to Axel Lin
Quoted 3 lines · Axel Lin

Current code uses devm_regulator_register() so the we don't need to explicitly call regulator_unregister() in .remove.
And then we don't need to save rdev pointer to tps->rdev[id].

Quoted 41 lines
---
  drivers/regulator/tps65218-regulator.c | 18 ------------------
  1 file changed, 18 deletions(-)
drivers/regulator/tps65218-regulator.c +0 -18
index d1c7831..1fb1db5 100644
@@ -267,23 +267,6 @@ static int tps65218_regulator_probe(struct platform_device *pdev)
  		return PTR_ERR(rdev);
  	}
 
-	/* Save regulator */
-	tps->rdev[id] = rdev;
-
-	return 0;
-}
-
-static int tps65218_regulator_remove(struct platform_device *pdev)
-{
-	struct tps65218 *tps = platform_get_drvdata(pdev);
-	const struct of_device_id	*match;
-	const struct tps_info		*template;
-
-	match = of_match_device(tps65218_of_match, &pdev->dev);
-	template = match->data;
-	regulator_unregister(tps->rdev[template->id]);
-	platform_set_drvdata(pdev, NULL);
-
  	return 0;
  }
 
@@ -294,7 +277,6 @@ static struct platform_driver tps65218_regulator_driver = {
  		.of_match_table = of_match_ptr(tps65218_of_match),
  	},
  	.probe = tps65218_regulator_probe,
-	.remove = tps65218_regulator_remove,
  };
 
  module_platform_driver(tps65218_regulator_driver);