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

Commit 114c5748 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

regulator: anatop: Remove checking control_reg in [set|get]_voltage_sel 



Remove checking control_reg in [set|get]_voltage_sel and then convert to use
regulator_[set|get]_voltage_sel_regmap for [set|get]_voltage_sel callbacks.

The anatop-reg-offset property is a required property rather than optional
property. So the question is what is the meaning of setting anatop-reg-offset
to 0? If 0 is a valid setting for anatop-reg-offset and it has special meaning,
we had better document it in the binding document. Otherwise, remove the testing
for control_reg in the driver.

No anatop voltage regulator node in the dts files set anatop-reg-offset to 0.
So I think it's safe to remove testing if control_reg is 0.

Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent d38018f2

drivers/regulator/anatop-regulator.c

+2 −23
Original line number Diff line number Diff line
@@ -55,17 +55,6 @@ struct anatop_regulator { 
	int sel;

};



static int anatop_regmap_set_voltage_sel(struct regulator_dev *reg,

					unsigned selector)

{

	struct anatop_regulator *anatop_reg = rdev_get_drvdata(reg);



	if (!anatop_reg->control_reg)

		return -ENOTSUPP;



	return regulator_set_voltage_sel_regmap(reg, selector);

}



static int anatop_regmap_set_voltage_time_sel(struct regulator_dev *reg,

	unsigned int old_sel,

	unsigned int new_sel)
@@ -92,16 +81,6 @@ static int anatop_regmap_set_voltage_time_sel(struct regulator_dev *reg, 
	return ret;

}



static int anatop_regmap_get_voltage_sel(struct regulator_dev *reg)

{

	struct anatop_regulator *anatop_reg = rdev_get_drvdata(reg);



	if (!anatop_reg->control_reg)

		return -ENOTSUPP;



	return regulator_get_voltage_sel_regmap(reg);

}



static int anatop_regmap_enable(struct regulator_dev *reg)

{

	struct anatop_regulator *anatop_reg = rdev_get_drvdata(reg);
@@ -178,8 +157,8 @@ static int anatop_regmap_set_bypass(struct regulator_dev *reg, bool enable) 
}



static struct regulator_ops anatop_rops = {

	.set_voltage_sel = anatop_regmap_set_voltage_sel,

	.get_voltage_sel = anatop_regmap_get_voltage_sel,

	.set_voltage_sel = regulator_set_voltage_sel_regmap,

	.get_voltage_sel = regulator_get_voltage_sel_regmap,

	.list_voltage = regulator_list_voltage_linear,

	.map_voltage = regulator_map_voltage_linear,

};