Skip to contentSkip to conversation

regulator: tps65910: Allow missing init_data for diagnostics

PATCH Applied Axel Lin 2 participants 2 messages Feb 18, 2014 – Aug 16, 2014

Subsystems (2)
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 regulator: tps65910: Allow missing init_data for diagnostics

The regulator core supports this to allow the configuration to be inspected at runtime even if no software management is enabled.

---
 drivers/regulator/tps65910-regulator.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)
drivers/regulator/tps65910-regulator.c +2 -11
index f50dd84..3c8bd34 100644
@@ -1050,7 +1050,7 @@ static struct tps65910_board *tps65910_parse_dt_reg_data(
 	*tps65910_reg_matches = matches;
 
 	for (idx = 0; idx < count; idx++) {
-		if (!matches[idx].init_data || !matches[idx].of_node)
+		if (!matches[idx].of_node)
 			continue;
 
 		pmic_plat_data->tps65910_pmic_init_data[idx] =
@@ -1080,7 +1080,6 @@ static int tps65910_probe(struct platform_device *pdev)
 	struct tps65910 *tps65910 = dev_get_drvdata(pdev->dev.parent);
 	struct regulator_config config = { };
 	struct tps_info *info;
-	struct regulator_init_data *reg_data;
 	struct regulator_dev *rdev;
 	struct tps65910_reg *pmic;
 	struct tps65910_board *pmic_plat_data;
@@ -1151,14 +1150,6 @@ static int tps65910_probe(struct platform_device *pdev)
 
 	for (i = 0; i < pmic->num_regulators && i < TPS65910_NUM_REGS;
 			i++, info++) {
-
-		reg_data = pmic_plat_data->tps65910_pmic_init_data[i];
-
-		/* Regulator API handles empty constraints but not NULL
-		 * constraints */
-		if (!reg_data)
-			continue;
-
 		/* Register the regulators */
 		pmic->info[i] = info;
 
@@ -1210,7 +1201,7 @@ static int tps65910_probe(struct platform_device *pdev)
 		pmic->desc[i].enable_mask = TPS65910_SUPPLY_STATE_ENABLED;
 
 		config.dev = tps65910->dev;
-		config.init_data = reg_data;
+		config.init_data = pmic_plat_data->tps65910_pmic_init_data[i];
 		config.driver_data = pmic;
 		config.regmap = tps65910->regmap;
 
Signature · 1 line
1.8.1.2
maintainer Applied
#1 lore raw
Quoted 2 lines · Axel Lin

The regulator core supports this to allow the configuration to be inspected at runtime even if no software management is enabled.

Applied, thanks.