lkml.org 
[lkml]   [2012]   [Apr]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 5/5] mfd: twl6040-core: Convert to devm_regmap_init_i2c()
On 04/25/2012 05:09 AM, Axel Lin wrote:
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> ---
> drivers/mfd/twl6040-core.c | 4 +---
> 1 files changed, 1 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/mfd/twl6040-core.c b/drivers/mfd/twl6040-core.c
> index 2d6beda..493f4a6 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;
> }

Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>


\
 
 \ /
  Last update: 2012-04-25 08:39    [W:0.111 / U:0.196 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site