regulator: Remove redundant regmap_update_bits call for TPS65023_REG_CON_CTRL2
Axel Lin [Mon, 6 Feb 2012 13:01:14 +0000 (21:01 +0800)]
This looks like a merge mistake.  Calling regmap_update_bits once is enough.

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

drivers/regulator/tps65023-regulator.c

index 18d61a0..43e4902 100644 (file)
@@ -491,10 +491,6 @@ static int __devinit tps_65023_probe(struct i2c_client *client,
        regmap_update_bits(tps->regmap, TPS65023_REG_CON_CTRL2,
                        TPS65023_REG_CTRL2_CORE_ADJ, TPS65023_REG_CTRL2_CORE_ADJ);
 
-       /* Enable setting output voltage by I2C */
-       regmap_update_bits(tps->regmap, TPS65023_REG_CON_CTRL2,
-                       TPS65023_REG_CTRL2_CORE_ADJ, TPS65023_REG_CTRL2_CORE_ADJ);
-
        return 0;
 
  fail: