* [PATCH 2/5] mfd: s5m-core: Convert to devm_regmap_init_i2c()
2012-04-25 2:01 [PATCH 1/5] mfd: rc5t583: Convert to devm_regmap_init_i2c() Axel Lin
@ 2012-04-25 2:03 ` Axel Lin
2012-04-25 2:04 ` [PATCH 3/5] mfd: tps65090: " Axel Lin
` (4 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Axel Lin @ 2012-04-25 2:03 UTC (permalink / raw)
To: linux-kernel; +Cc: Samuel Ortiz, Sangbeom Kim
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
drivers/mfd/s5m-core.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/mfd/s5m-core.c b/drivers/mfd/s5m-core.c
index 48949d9..dd17030 100644
--- a/drivers/mfd/s5m-core.c
+++ b/drivers/mfd/s5m-core.c
@@ -114,12 +114,12 @@ static int s5m87xx_i2c_probe(struct i2c_client *i2c,
s5m87xx->wakeup = pdata->wakeup;
}
- s5m87xx->regmap = regmap_init_i2c(i2c, &s5m_regmap_config);
+ s5m87xx->regmap = devm_regmap_init_i2c(i2c, &s5m_regmap_config);
if (IS_ERR(s5m87xx->regmap)) {
ret = PTR_ERR(s5m87xx->regmap);
dev_err(&i2c->dev, "Failed to allocate register map: %d\n",
ret);
- goto err;
+ return ret;
}
s5m87xx->rtc = i2c_new_dummy(i2c->adapter, RTC_I2C_ADDR);
@@ -159,7 +159,6 @@ err:
mfd_remove_devices(s5m87xx->dev);
s5m_irq_exit(s5m87xx);
i2c_unregister_device(s5m87xx->rtc);
- regmap_exit(s5m87xx->regmap);
return ret;
}
@@ -170,7 +169,6 @@ static int s5m87xx_i2c_remove(struct i2c_client *i2c)
mfd_remove_devices(s5m87xx->dev);
s5m_irq_exit(s5m87xx);
i2c_unregister_device(s5m87xx->rtc);
- regmap_exit(s5m87xx->regmap);
return 0;
}
--
1.7.5.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 3/5] mfd: tps65090: Convert to devm_regmap_init_i2c()
2012-04-25 2:01 [PATCH 1/5] mfd: rc5t583: Convert to devm_regmap_init_i2c() Axel Lin
2012-04-25 2:03 ` [PATCH 2/5] mfd: s5m-core: " Axel Lin
@ 2012-04-25 2:04 ` Axel Lin
2012-04-25 5:20 ` Venu Byravarasu
2012-04-25 2:06 ` [PATCH 4/5] mfd: tps65217: " Axel Lin
` (3 subsequent siblings)
5 siblings, 1 reply; 9+ messages in thread
From: Axel Lin @ 2012-04-25 2:04 UTC (permalink / raw)
To: linux-kernel; +Cc: Samuel Ortiz, Venu Byravarasu
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
drivers/mfd/tps65090.c | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/mfd/tps65090.c b/drivers/mfd/tps65090.c
index da821d9..3e12bba 100644
--- a/drivers/mfd/tps65090.c
+++ b/drivers/mfd/tps65090.c
@@ -283,8 +283,8 @@ static int __devinit tps65090_i2c_probe(struct i2c_client *client,
}
}
- tps65090->rmap = regmap_init_i2c(tps65090->client,
- &tps65090_regmap_config);
+ tps65090->rmap = devm_regmap_init_i2c(tps65090->client,
+ &tps65090_regmap_config);
if (IS_ERR(tps65090->rmap)) {
ret = PTR_ERR(tps65090->rmap);
dev_err(&client->dev, "regmap_init failed with err: %d\n", ret);
@@ -296,14 +296,11 @@ static int __devinit tps65090_i2c_probe(struct i2c_client *client,
if (ret) {
dev_err(&client->dev, "add mfd devices failed with err: %d\n",
ret);
- goto err_regmap_exit;
+ goto err_irq_exit;
}
return 0;
-err_regmap_exit:
- regmap_exit(tps65090->rmap);
-
err_irq_exit:
if (client->irq)
free_irq(client->irq, tps65090);
@@ -316,7 +313,6 @@ static int __devexit tps65090_i2c_remove(struct i2c_client *client)
struct tps65090 *tps65090 = i2c_get_clientdata(client);
mfd_remove_devices(tps65090->dev);
- regmap_exit(tps65090->rmap);
if (client->irq)
free_irq(client->irq, tps65090);
--
1.7.5.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* RE: [PATCH 3/5] mfd: tps65090: Convert to devm_regmap_init_i2c()
2012-04-25 2:04 ` [PATCH 3/5] mfd: tps65090: " Axel Lin
@ 2012-04-25 5:20 ` Venu Byravarasu
0 siblings, 0 replies; 9+ messages in thread
From: Venu Byravarasu @ 2012-04-25 5:20 UTC (permalink / raw)
To: Axel Lin, linux-kernel@vger.kernel.org; +Cc: Samuel Ortiz
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 1947 bytes --]
Thanks for the patch.
Acked by: Venu Byravarasu<vbyravarasu@nvidia.com>
> -----Original Message-----
> From: Axel Lin [mailto:axel.lin@gmail.com]
> Sent: Wednesday, April 25, 2012 7:35 AM
> To: linux-kernel@vger.kernel.org
> Cc: Samuel Ortiz; Venu Byravarasu
> Subject: [PATCH 3/5] mfd: tps65090: Convert to devm_regmap_init_i2c()
>
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> ---
> drivers/mfd/tps65090.c | 10 +++-------
> 1 files changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/mfd/tps65090.c b/drivers/mfd/tps65090.c
> index da821d9..3e12bba 100644
> --- a/drivers/mfd/tps65090.c
> +++ b/drivers/mfd/tps65090.c
> @@ -283,8 +283,8 @@ static int __devinit tps65090_i2c_probe(struct
> i2c_client *client,
> }
> }
>
> - tps65090->rmap = regmap_init_i2c(tps65090->client,
> - &tps65090_regmap_config);
> + tps65090->rmap = devm_regmap_init_i2c(tps65090->client,
> + &tps65090_regmap_config);
> if (IS_ERR(tps65090->rmap)) {
> ret = PTR_ERR(tps65090->rmap);
> dev_err(&client->dev, "regmap_init failed with err: %d\n", ret);
> @@ -296,14 +296,11 @@ static int __devinit tps65090_i2c_probe(struct
> i2c_client *client,
> if (ret) {
> dev_err(&client->dev, "add mfd devices failed with err: %d\n",
> ret);
> - goto err_regmap_exit;
> + goto err_irq_exit;
> }
>
> return 0;
>
> -err_regmap_exit:
> - regmap_exit(tps65090->rmap);
> -
> err_irq_exit:
> if (client->irq)
> free_irq(client->irq, tps65090);
> @@ -316,7 +313,6 @@ static int __devexit tps65090_i2c_remove(struct
> i2c_client *client)
> struct tps65090 *tps65090 = i2c_get_clientdata(client);
>
> mfd_remove_devices(tps65090->dev);
> - regmap_exit(tps65090->rmap);
> if (client->irq)
> free_irq(client->irq, tps65090);
>
> --
> 1.7.5.4
>
>
ÿôèº{.nÇ+‰·Ÿ®‰†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a¢f£¢·hšïêÿ‘êçz_è®\x03(階ŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨èÚ&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 4/5] mfd: tps65217: Convert to devm_regmap_init_i2c()
2012-04-25 2:01 [PATCH 1/5] mfd: rc5t583: Convert to devm_regmap_init_i2c() Axel Lin
2012-04-25 2:03 ` [PATCH 2/5] mfd: s5m-core: " Axel Lin
2012-04-25 2:04 ` [PATCH 3/5] mfd: tps65090: " Axel Lin
@ 2012-04-25 2:06 ` Axel Lin
2012-04-25 2:09 ` [PATCH 5/5] mfd: twl6040-core: " Axel Lin
` (2 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Axel Lin @ 2012-04-25 2:06 UTC (permalink / raw)
To: linux-kernel; +Cc: Samuel Ortiz, AnilKumar Ch
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
drivers/mfd/tps65217.c | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/drivers/mfd/tps65217.c b/drivers/mfd/tps65217.c
index f7d854e..c064c0a 100644
--- a/drivers/mfd/tps65217.c
+++ b/drivers/mfd/tps65217.c
@@ -150,7 +150,7 @@ static int __devinit tps65217_probe(struct i2c_client *client,
return -ENOMEM;
tps->pdata = pdata;
- tps->regmap = regmap_init_i2c(client, &tps65217_regmap_config);
+ tps->regmap = devm_regmap_init_i2c(client, &tps65217_regmap_config);
if (IS_ERR(tps->regmap)) {
ret = PTR_ERR(tps->regmap);
dev_err(tps->dev, "Failed to allocate register map: %d\n",
@@ -163,9 +163,9 @@ static int __devinit tps65217_probe(struct i2c_client *client,
ret = tps65217_reg_read(tps, TPS65217_REG_CHIPID, &version);
if (ret < 0) {
- dev_err(tps->dev, "Failed to read revision"
- " register: %d\n", ret);
- goto err_regmap;
+ dev_err(tps->dev, "Failed to read revision register: %d\n",
+ ret);
+ return ret;
}
dev_info(tps->dev, "TPS65217 ID %#x version 1.%d\n",
@@ -190,11 +190,6 @@ static int __devinit tps65217_probe(struct i2c_client *client,
}
return 0;
-
-err_regmap:
- regmap_exit(tps->regmap);
-
- return ret;
}
static int __devexit tps65217_remove(struct i2c_client *client)
@@ -205,8 +200,6 @@ static int __devexit tps65217_remove(struct i2c_client *client)
for (i = 0; i < TPS65217_NUM_REGULATOR; i++)
platform_device_unregister(tps->regulator_pdev[i]);
- regmap_exit(tps->regmap);
-
return 0;
}
--
1.7.5.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 5/5] mfd: twl6040-core: Convert to devm_regmap_init_i2c()
2012-04-25 2:01 [PATCH 1/5] mfd: rc5t583: Convert to devm_regmap_init_i2c() Axel Lin
` (2 preceding siblings ...)
2012-04-25 2:06 ` [PATCH 4/5] mfd: tps65217: " Axel Lin
@ 2012-04-25 2:09 ` Axel Lin
2012-04-25 6:33 ` Peter Ujfalusi
2012-04-25 7:12 ` [PATCH 1/5] mfd: rc5t583: " Laxman Dewangan
2012-05-09 15:53 ` Samuel Ortiz
5 siblings, 1 reply; 9+ messages in thread
From: Axel Lin @ 2012-04-25 2:09 UTC (permalink / raw)
To: linux-kernel; +Cc: Samuel Ortiz, Peter Ujfalusi, Misael Lopez Cruz
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;
}
--
1.7.5.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 5/5] mfd: twl6040-core: Convert to devm_regmap_init_i2c()
2012-04-25 2:09 ` [PATCH 5/5] mfd: twl6040-core: " Axel Lin
@ 2012-04-25 6:33 ` Peter Ujfalusi
0 siblings, 0 replies; 9+ messages in thread
From: Peter Ujfalusi @ 2012-04-25 6:33 UTC (permalink / raw)
To: Axel Lin; +Cc: linux-kernel, Samuel Ortiz, Misael Lopez Cruz
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>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/5] mfd: rc5t583: Convert to devm_regmap_init_i2c()
2012-04-25 2:01 [PATCH 1/5] mfd: rc5t583: Convert to devm_regmap_init_i2c() Axel Lin
` (3 preceding siblings ...)
2012-04-25 2:09 ` [PATCH 5/5] mfd: twl6040-core: " Axel Lin
@ 2012-04-25 7:12 ` Laxman Dewangan
2012-05-09 15:53 ` Samuel Ortiz
5 siblings, 0 replies; 9+ messages in thread
From: Laxman Dewangan @ 2012-04-25 7:12 UTC (permalink / raw)
To: Axel Lin; +Cc: linux-kernel@vger.kernel.org, Samuel Ortiz
On Wednesday 25 April 2012 07:31 AM, Axel Lin wrote:
> Signed-off-by: Axel Lin<axel.lin@gmail.com>
> ---
Acked-by: Laxman Dewangan <ldewangan@nvidia.com>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 1/5] mfd: rc5t583: Convert to devm_regmap_init_i2c()
2012-04-25 2:01 [PATCH 1/5] mfd: rc5t583: Convert to devm_regmap_init_i2c() Axel Lin
` (4 preceding siblings ...)
2012-04-25 7:12 ` [PATCH 1/5] mfd: rc5t583: " Laxman Dewangan
@ 2012-05-09 15:53 ` Samuel Ortiz
5 siblings, 0 replies; 9+ messages in thread
From: Samuel Ortiz @ 2012-05-09 15:53 UTC (permalink / raw)
To: Axel Lin; +Cc: linux-kernel, Laxman Dewangan
Hi Axel,
On Wed, Apr 25, 2012 at 10:01:55AM +0800, Axel Lin wrote:
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> ---
> drivers/mfd/rc5t583.c | 7 ++-----
> 1 files changed, 2 insertions(+), 5 deletions(-)
All 5 patches applied, thanks.
Cheers,
Samuel.
--
Intel Open Source Technology Centre
http://oss.intel.com/
^ permalink raw reply [flat|nested] 9+ messages in thread