projects
/
GitHub
/
exynos8895
/
android_kernel_samsung_universal8895.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0ef4619
)
mfd: Convert twl6040-core to devm_regmap_init_i2c()
author
Axel Lin
<axel.lin@gmail.com>
Wed, 25 Apr 2012 02:09:46 +0000
(10:09 +0800)
committer
Samuel Ortiz
<sameo@linux.intel.com>
Wed, 9 May 2012 15:52:15 +0000
(17:52 +0200)
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>
drivers/mfd/twl6040-core.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/mfd/twl6040-core.c
b/drivers/mfd/twl6040-core.c
index 2d6bedadca096d68eec4ce61332b57d6f08140a8..493f4a692747d1b7730a54fde9f265dccd726265 100644
(file)
--- 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;
}