Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c7d614f authored by Nishanth Menon's avatar Nishanth Menon Committed by Mark Brown
Browse files

regulator: tps65917/palmas: Simplify multiple dereference of match->of_node 



Just dereference match->of_node once instead of using match->of_node.

Signed-off-by: default avatarNishanth Menon <nm@ti.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7f091e53

drivers/regulator/palmas-regulator.c

+8 −11
Original line number Diff line number Diff line
@@ -1493,10 +1493,12 @@ static int palmas_dt_to_pdata(struct device *dev, 
	for (idx = 0; idx < ddata->max_reg; idx++) {

		static struct of_regulator_match *match;

		struct palmas_reg_init *rinit;

		struct device_node *np;



		match = &ddata->palmas_matches[idx];

		np = match->of_node;



		if (!match->init_data || !match->of_node)

		if (!match->init_data || !np)

			continue;



		rinit = devm_kzalloc(dev, sizeof(*rinit), GFP_KERNEL);
@@ -1506,11 +1508,8 @@ static int palmas_dt_to_pdata(struct device *dev, 
		pdata->reg_data[idx] = match->init_data;

		pdata->reg_init[idx] = rinit;



		rinit->warm_reset = of_property_read_bool(match->of_node,

							  "ti,warm-reset");



		ret = of_property_read_u32(match->of_node, "ti,roof-floor",

					   &prop);

		rinit->warm_reset = of_property_read_bool(np, "ti,warm-reset");

		ret = of_property_read_u32(np, "ti,roof-floor", &prop);

		/* EINVAL: Property not found */

		if (ret != -EINVAL) {

			int econtrol;
@@ -1539,19 +1538,17 @@ static int palmas_dt_to_pdata(struct device *dev, 
			rinit->roof_floor = econtrol;

		}



		ret = of_property_read_u32(match->of_node, "ti,mode-sleep",

					   &prop);

		ret = of_property_read_u32(np, "ti,mode-sleep", &prop);

		if (!ret)

			rinit->mode_sleep = prop;



		ret = of_property_read_bool(match->of_node, "ti,smps-range");

		ret = of_property_read_bool(np, "ti,smps-range");

		if (ret)

			rinit->vsel = PALMAS_SMPS12_VOLTAGE_RANGE;



		if (idx == PALMAS_REG_LDO8)

			pdata->enable_ldo8_tracking = of_property_read_bool(

						match->of_node,

						"ti,enable-ldo8-tracking");

						np, "ti,enable-ldo8-tracking");

	}



	pdata->ldo6_vibrator = of_property_read_bool(node, "ti,ldo6-vibrator");