2013-06-12 08:40:17

by Sachin Kamat

Subject: [PATCH 1/1] mfd: 88pm860x: Use devm_regmap_init_i2c()

devm_regmap_init_i2c() is device managed and makes cleanup simpler.

Signed-off-by: Sachin Kamat <[email protected]>
---
drivers/mfd/88pm860x-core.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c
index ef6d82c..eeb481d 100644
--- a/drivers/mfd/88pm860x-core.c
+++ b/drivers/mfd/88pm860x-core.c
@@ -1156,7 +1156,7 @@ static int pm860x_probe(struct i2c_client *client,
return -ENOMEM;

chip->id = verify_addr(client);
- chip->regmap = regmap_init_i2c(client, &pm860x_regmap_config);
+ chip->regmap = devm_regmap_init_i2c(client, &pm860x_regmap_config);
if (IS_ERR(chip->regmap)) {
ret = PTR_ERR(chip->regmap);
dev_err(&client->dev, "Failed to allocate register map: %d\n",
@@ -1203,7 +1203,6 @@ static int pm860x_remove(struct i2c_client *client)
regmap_exit(chip->regmap_companion);
i2c_unregister_device(chip->companion);
}
- regmap_exit(chip->regmap);
return 0;
}

--
1.7.9.5

2013-06-12 09:27:41

by Lee Jones

Subject: Re: [PATCH 1/1] mfd: 88pm860x: Use devm_regmap_init_i2c()

On Wed, 12 Jun 2013, Sachin Kamat wrote:

> devm_regmap_init_i2c() is device managed and makes cleanup simpler.
>
> Signed-off-by: Sachin Kamat <[email protected]>
> ---
> drivers/mfd/88pm860x-core.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c
> index ef6d82c..eeb481d 100644
> --- a/drivers/mfd/88pm860x-core.c
> +++ b/drivers/mfd/88pm860x-core.c
> @@ -1156,7 +1156,7 @@ static int pm860x_probe(struct i2c_client *client,
> return -ENOMEM;
>
> chip->id = verify_addr(client);
> - chip->regmap = regmap_init_i2c(client, &pm860x_regmap_config);
> + chip->regmap = devm_regmap_init_i2c(client, &pm860x_regmap_config);
> if (IS_ERR(chip->regmap)) {
> ret = PTR_ERR(chip->regmap);
> dev_err(&client->dev, "Failed to allocate register map: %d\n",
> @@ -1203,7 +1203,6 @@ static int pm860x_remove(struct i2c_client *client)
> regmap_exit(chip->regmap_companion);
> i2c_unregister_device(chip->companion);
> }
> - regmap_exit(chip->regmap);
> return 0;
> }

Applied, thanks.

--
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog