diff options
| author | Axel Lin <axel.lin@ingics.com> | 2015-07-30 21:06:43 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-08-03 17:22:37 +0100 |
| commit | 08b472f7b602c60c69f278ba1e15535f5c86ee24 (patch) | |
| tree | 5536bd93028056e8c4437204890e84134316887f /drivers/regulator | |
| parent | 53e381627d34c4c7a3ea00c041c38f447828f755 (diff) | |
regulator: mt6311: Trivial clean up
Make mt6311_buck_ops, mt6311_ldo_ops and mt6311_regulators const and remove
unneeded error variable in mt6311_i2c_probe().
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/mt6311-regulator.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/regulator/mt6311-regulator.c b/drivers/regulator/mt6311-regulator.c index b140da04a657..2c2c85bf08c5 100644 --- a/drivers/regulator/mt6311-regulator.c +++ b/drivers/regulator/mt6311-regulator.c @@ -41,7 +41,7 @@ static const struct regulator_linear_range buck_volt_range[] = { REGULATOR_LINEAR_RANGE(MT6311_MIN_UV, 0, 0x7f, MT6311_STEP_UV), }; -static struct regulator_ops mt6311_buck_ops = { +static const struct regulator_ops mt6311_buck_ops = { .list_voltage = regulator_list_voltage_linear_range, .map_voltage = regulator_map_voltage_linear_range, .set_voltage_sel = regulator_set_voltage_sel_regmap, @@ -52,7 +52,7 @@ static struct regulator_ops mt6311_buck_ops = { .is_enabled = regulator_is_enabled_regmap, }; -static struct regulator_ops mt6311_ldo_ops = { +static const struct regulator_ops mt6311_ldo_ops = { .enable = regulator_enable_regmap, .disable = regulator_disable_regmap, .is_enabled = regulator_is_enabled_regmap, @@ -91,7 +91,7 @@ static struct regulator_ops mt6311_ldo_ops = { .enable_mask = MT6311_PMIC_RG_VBIASN_EN_MASK,\ } -static struct regulator_desc mt6311_regulators[] = { +static const struct regulator_desc mt6311_regulators[] = { MT6311_BUCK(VDVFS), MT6311_LDO(VBIASN), }; @@ -105,15 +105,15 @@ static int mt6311_i2c_probe(struct i2c_client *i2c, struct regulator_config config = { }; struct regulator_dev *rdev; struct regmap *regmap; - int error, i, ret; + int i, ret; unsigned int data; regmap = devm_regmap_init_i2c(i2c, &mt6311_regmap_config); if (IS_ERR(regmap)) { - error = PTR_ERR(regmap); + ret = PTR_ERR(regmap); dev_err(&i2c->dev, "Failed to allocate register map: %d\n", - error); - return error; + ret); + return ret; } ret = regmap_read(regmap, MT6311_SWCID, &data); |