Re: [PATCH 5/5] mfd: twl6040-core: Convert to devm_regmap_init_i2c()

[Peter Ujfalusi]

On 04/25/2012 05:09 AM, Axel Lin wrote:
> Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
> ---
>  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@xxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/