Skip to content

Commit

Permalink
regulator: mc13xxx: Remove mc13xxx_sw_regulator_is_enabled function
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Axel Lin authored and Mark Brown committed Jun 19, 2012
1 parent 0e8e5c3 commit 2c19ad4
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 8 deletions.
1 change: 0 additions & 1 deletion drivers/regulator/mc13892-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,6 @@ static int mc13892_sw_regulator_set_voltage_sel(struct regulator_dev *rdev,
}

static struct regulator_ops mc13892_sw_regulator_ops = {
.is_enabled = mc13xxx_sw_regulator_is_enabled,
.list_voltage = regulator_list_voltage_table,
.set_voltage_sel = mc13892_sw_regulator_set_voltage_sel,
.get_voltage = mc13892_sw_regulator_get_voltage,
Expand Down
6 changes: 0 additions & 6 deletions drivers/regulator/mc13xxx-regulator-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -170,12 +170,6 @@ struct regulator_ops 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
int __devinit mc13xxx_get_num_regulators_dt(struct platform_device *pdev)
{
Expand Down
1 change: 0 additions & 1 deletion drivers/regulator/mc13xxx.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ struct mc13xxx_regulator_priv {
};

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,
int min_uV, int max_uV, unsigned *selector);
extern int mc13xxx_fixed_regulator_get_voltage(struct regulator_dev *rdev);
Expand Down

0 comments on commit 2c19ad4

Please sign in to comment.