OSDN Git Service

regulator: tps62360: Convert to devm_regmap_init_i2c()
authorAxel Lin <axel.lin@gmail.com>
Sat, 7 Apr 2012 15:29:56 +0000 (23:29 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 10 Apr 2012 10:04:27 +0000 (11:04 +0100)
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
drivers/regulator/tps62360-regulator.c

index 8fffc6e..0657c98 100644 (file)
@@ -320,7 +320,7 @@ static int __devinit tps62360_probe(struct i2c_client *client,
        tps->desc.ops = &tps62360_dcdc_ops;
        tps->desc.type = REGULATOR_VOLTAGE;
        tps->desc.owner = THIS_MODULE;
-       tps->regmap = regmap_init_i2c(client, &tps62360_regmap_config);
+       tps->regmap = devm_regmap_init_i2c(client, &tps62360_regmap_config);
        if (IS_ERR(tps->regmap)) {
                ret = PTR_ERR(tps->regmap);
                dev_err(&client->dev, "%s() Err: Failed to allocate register"
@@ -408,7 +408,6 @@ err_gpio1:
        if (gpio_is_valid(tps->vsel0_gpio))
                gpio_free(tps->vsel0_gpio);
 err_gpio0:
-       regmap_exit(tps->regmap);
        return ret;
 }
 
@@ -429,7 +428,6 @@ static int __devexit tps62360_remove(struct i2c_client *client)
                gpio_free(tps->vsel0_gpio);
 
        regulator_unregister(tps->rdev);
-       regmap_exit(tps->regmap);
        return 0;
 }