From: Axel Lin <axel.lin@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: Samuel Ortiz <sameo@linux.intel.com>,
Venu Byravarasu <vbyravarasu@nvidia.com>
Subject: [PATCH 3/5] mfd: tps65090: Convert to devm_regmap_init_i2c()
Date: Wed, 25 Apr 2012 10:04:58 +0800 [thread overview]
Message-ID: <1335319498.30909.6.camel@phoenix> (raw)
In-Reply-To: <1335319315.30909.2.camel@phoenix>
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
next prev parent reply other threads:[~2012-04-25 2:05 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2012-04-25 5:20 ` [PATCH 3/5] mfd: tps65090: " Venu Byravarasu
2012-04-25 2:06 ` [PATCH 4/5] mfd: tps65217: " Axel Lin
2012-04-25 2:09 ` [PATCH 5/5] mfd: twl6040-core: " 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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1335319498.30909.6.camel@phoenix \
--to=axel.lin@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sameo@linux.intel.com \
--cc=vbyravarasu@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.