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

Commit 2c19ad43 authored Jun 19, 2012 by Axel Lin Committed by Mark Brown Jun 19, 2012

regulator: mc13xxx: Remove mc13xxx_sw_regulator_is_enabled function



If .is_enabled callback is not implemented, regulator core assumes that the
regulator is always on. Thus we don't need mc13xxx_sw_regulator_is_enabled
function.

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

parent 0e8e5c34

drivers/regulator/mc13892-regulator.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -469,7 +469,6 @@ static int mc13892_sw_regulator_set_voltage_sel(struct regulator_dev *rdev,
	}		}

	static struct regulator_ops mc13892_sw_regulator_ops = {		static struct regulator_ops mc13892_sw_regulator_ops = {
	.is_enabled = mc13xxx_sw_regulator_is_enabled,
	.list_voltage = regulator_list_voltage_table,		.list_voltage = regulator_list_voltage_table,
	.set_voltage_sel = mc13892_sw_regulator_set_voltage_sel,		.set_voltage_sel = mc13892_sw_regulator_set_voltage_sel,
	.get_voltage = mc13892_sw_regulator_get_voltage,		.get_voltage = mc13892_sw_regulator_get_voltage,

drivers/regulator/mc13xxx-regulator-core.c

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -170,12 +170,6 @@ struct regulator_ops mc13xxx_fixed_regulator_ops = {
	};		};
	EXPORT_SYMBOL_GPL(mc13xxx_fixed_regulator_ops);		EXPORT_SYMBOL_GPL(mc13xxx_fixed_regulator_ops);

	int mc13xxx_sw_regulator_is_enabled(struct regulator_dev *rdev)
	{
	return 1;
	}
	EXPORT_SYMBOL_GPL(mc13xxx_sw_regulator_is_enabled);

	#ifdef CONFIG_OF		#ifdef CONFIG_OF
	int __devinit mc13xxx_get_num_regulators_dt(struct platform_device *pdev)		int __devinit mc13xxx_get_num_regulators_dt(struct platform_device *pdev)
	{		{

drivers/regulator/mc13xxx.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -33,7 +33,6 @@ struct mc13xxx_regulator_priv {
	};		};

	extern int mc13xxx_sw_regulator(struct regulator_dev *rdev);		extern int mc13xxx_sw_regulator(struct regulator_dev *rdev);
	extern int mc13xxx_sw_regulator_is_enabled(struct regulator_dev *rdev);
	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);		extern int mc13xxx_fixed_regulator_get_voltage(struct regulator_dev *rdev);