summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2012-04-25 06:09:46 +0400
committerSamuel Ortiz <sameo@linux.intel.com>2012-05-09 19:52:15 +0400
commitbbf6adc10cb2d5a1345cc66e61b3891d42a9afbe (patch)
tree9ad47e599fb6107cf9fdf1a4a711da51293401ac
parent0ef4619c74ef1e24e9ee340f95ee922f970cde54 (diff)
downloadlinux-bbf6adc10cb2d5a1345cc66e61b3891d42a9afbe.tar.xz
mfd: Convert twl6040-core to devm_regmap_init_i2c()
Signed-off-by: Axel Lin <axel.lin@gmail.com> Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r--drivers/mfd/twl6040-core.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mfd/twl6040-core.c b/drivers/mfd/twl6040-core.c
index 2d6bedadca09..493f4a692747 100644
--- a/drivers/mfd/twl6040-core.c
+++ b/drivers/mfd/twl6040-core.c
@@ -524,7 +524,7 @@ static int __devinit twl6040_probe(struct i2c_client *client,
goto err;
}
- twl6040->regmap = regmap_init_i2c(client, &twl6040_regmap_config);
+ twl6040->regmap = devm_regmap_init_i2c(client, &twl6040_regmap_config);
if (IS_ERR(twl6040->regmap)) {
ret = PTR_ERR(twl6040->regmap);
goto err;
@@ -623,7 +623,6 @@ gpio2_err:
gpio_free(twl6040->audpwron);
gpio1_err:
i2c_set_clientdata(client, NULL);
- regmap_exit(twl6040->regmap);
err:
return ret;
}
@@ -643,7 +642,6 @@ static int __devexit twl6040_remove(struct i2c_client *client)
mfd_remove_devices(&client->dev);
i2c_set_clientdata(client, NULL);
- regmap_exit(twl6040->regmap);
return 0;
}