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

Commit b571dc38 authored Aug 10, 2012 by Axel Lin Committed by Mark Brown Aug 28, 2012

regulator: mc13xxx: Remove get_voltage implementation for single voltage regulators



This is not required after commit f7df20ec
"regulator: core: Use list_voltage() to read single voltage regulators"

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

parent 89009e18

drivers/regulator/mc13783-regulator.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -324,7 +324,6 @@ static struct regulator_ops mc13783_gpo_regulator_ops = {
	.is_enabled = mc13783_gpo_regulator_is_enabled,		.is_enabled = mc13783_gpo_regulator_is_enabled,
	.list_voltage = regulator_list_voltage_table,		.list_voltage = regulator_list_voltage_table,
	.set_voltage = mc13xxx_fixed_regulator_set_voltage,		.set_voltage = mc13xxx_fixed_regulator_set_voltage,
	.get_voltage = mc13xxx_fixed_regulator_get_voltage,
	};		};

	static int __devinit mc13783_regulator_probe(struct platform_device *pdev)		static int __devinit mc13783_regulator_probe(struct platform_device *pdev)

drivers/regulator/mc13892-regulator.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -390,7 +390,6 @@ static struct regulator_ops mc13892_gpo_regulator_ops = {
	.is_enabled = mc13892_gpo_regulator_is_enabled,		.is_enabled = mc13892_gpo_regulator_is_enabled,
	.list_voltage = regulator_list_voltage_table,		.list_voltage = regulator_list_voltage_table,
	.set_voltage = mc13xxx_fixed_regulator_set_voltage,		.set_voltage = mc13xxx_fixed_regulator_set_voltage,
	.get_voltage = mc13xxx_fixed_regulator_get_voltage,
	};		};

	static int mc13892_sw_regulator_get_voltage_sel(struct regulator_dev *rdev)		static int mc13892_sw_regulator_get_voltage_sel(struct regulator_dev *rdev)

drivers/regulator/mc13xxx-regulator-core.c

+0 −11

Original line number	Original line	Diff line number	Diff line
	@@ -152,23 +152,12 @@ int mc13xxx_fixed_regulator_set_voltage(struct regulator_dev *rdev, int min_uV,
	}		}
	EXPORT_SYMBOL_GPL(mc13xxx_fixed_regulator_set_voltage);		EXPORT_SYMBOL_GPL(mc13xxx_fixed_regulator_set_voltage);

	int mc13xxx_fixed_regulator_get_voltage(struct regulator_dev *rdev)
	{
	int id = rdev_get_id(rdev);

	dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id);

	return rdev->desc->volt_table[0];
	}
	EXPORT_SYMBOL_GPL(mc13xxx_fixed_regulator_get_voltage);

	struct regulator_ops mc13xxx_fixed_regulator_ops = {		struct regulator_ops mc13xxx_fixed_regulator_ops = {
	.enable = mc13xxx_regulator_enable,		.enable = mc13xxx_regulator_enable,
	.disable = mc13xxx_regulator_disable,		.disable = mc13xxx_regulator_disable,
	.is_enabled = mc13xxx_regulator_is_enabled,		.is_enabled = mc13xxx_regulator_is_enabled,
	.list_voltage = regulator_list_voltage_table,		.list_voltage = regulator_list_voltage_table,
	.set_voltage = mc13xxx_fixed_regulator_set_voltage,		.set_voltage = mc13xxx_fixed_regulator_set_voltage,
	.get_voltage = mc13xxx_fixed_regulator_get_voltage,
	};		};
	EXPORT_SYMBOL_GPL(mc13xxx_fixed_regulator_ops);		EXPORT_SYMBOL_GPL(mc13xxx_fixed_regulator_ops);

drivers/regulator/mc13xxx.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -34,7 +34,6 @@ struct mc13xxx_regulator_priv {

	extern int mc13xxx_fixed_regulator_set_voltage(struct regulator_dev *rdev,		extern int mc13xxx_fixed_regulator_set_voltage(struct regulator_dev *rdev,
	int min_uV, int max_uV, unsigned *selector);		int min_uV, int max_uV, unsigned *selector);
	extern int mc13xxx_fixed_regulator_get_voltage(struct regulator_dev *rdev);

	#ifdef CONFIG_OF		#ifdef CONFIG_OF
	extern int mc13xxx_get_num_regulators_dt(struct platform_device *pdev);		extern int mc13xxx_get_num_regulators_dt(struct platform_device *pdev);