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

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

regulator: ab8500-ext: Remove get_voltage to avoid duplicate implementation 



The implementation of ab8500_ext_fixed_get_voltage is identical to
ab8500_ext_list_voltage. We can avoid the duplicate implementation by just
remove get_voltage. For fixed regulator, regulator core will call
list_voltage(rdev, 0) to get voltage if both get_voltage get_voltage_sel are
not implemented.

Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Acked-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent bcbba9de

drivers/regulator/ab8500-ext.c

+0 −16
Original line number Diff line number Diff line
@@ -237,21 +237,6 @@ static unsigned int ab8500_ext_regulator_get_mode(struct regulator_dev *rdev) 
	return ret;

}



static int ab8500_ext_fixed_get_voltage(struct regulator_dev *rdev)

{

	struct regulation_constraints *regu_constraints = rdev->constraints;



	if (regu_constraints == NULL) {

		dev_err(rdev_get_dev(rdev), "regulator constraints null pointer\n");

		return -EINVAL;

	}

	if (regu_constraints->min_uV && regu_constraints->max_uV) {

		if (regu_constraints->min_uV == regu_constraints->max_uV)

			return regu_constraints->min_uV;

	}

	return -EINVAL;

}



static int ab8500_ext_list_voltage(struct regulator_dev *rdev,

				   unsigned selector)

{
@@ -275,7 +260,6 @@ static struct regulator_ops ab8500_ext_regulator_ops = { 
	.is_enabled		= ab8500_ext_regulator_is_enabled,

	.set_mode		= ab8500_ext_regulator_set_mode,

	.get_mode		= ab8500_ext_regulator_get_mode,

	.get_voltage		= ab8500_ext_fixed_get_voltage,

	.list_voltage		= ab8500_ext_list_voltage,

};