Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-01 16:41:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

regulator: mt6311: Trivial clean up

Browse Source 
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>
This commit is contained in:
Axel Lin 2015-07-30 21:06:43 +08:00 committed by Mark Brown
parent 53e381627d
commit 08b472f7b6
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/regulator/mt6311-regulator.c
View File

@ -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);