From: Axel Lin <axel.lin@ingics.com>
Date: Thu, 30 Jul 2015 13:06:43 +0000 (+0800)
Subject: regulator: mt6311: Trivial clean up
X-Git-Tag: firefly_0821_release~176^2~1211^2~2^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=08b472f7b602c60c69f278ba1e15535f5c86ee24;p=firefly-linux-kernel-4.4.55.git

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>
---

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