From: Laxman Dewangan <ldewangan@nvidia.com>
To: <grant.likely@secretlab.ca>, <linus.walleij@stericsson.com>,
<sameo@linux.intel.com>
Cc: <linux-kernel@vger.kernel.org>, <swarren@nvidia.com>,
<broonie@opensource.wolfsonmicro.com>,
Laxman Dewangan <ldewangan@nvidia.com>
Subject: [PATCH V2 1/6] mfd: tps6586x:use devm managed resources
Date: Mon, 16 Jul 2012 12:21:45 +0530 [thread overview]
Message-ID: <1342421510-10638-2-git-send-email-ldewangan@nvidia.com> (raw)
In-Reply-To: <1342421510-10638-1-git-send-email-ldewangan@nvidia.com>
Allocate memory for device state using devm_kzalloc(), get the
IRQ using devm_request_irq().
All to simplify accounting and letting the kernel do the
garbage-collection.
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
---
Changes V1 -> V2:
No change, generated new patch for V2 series.
drivers/mfd/tps6586x.c | 23 ++++++++---------------
1 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/drivers/mfd/tps6586x.c b/drivers/mfd/tps6586x.c
index c84b550..1256b7f 100644
--- a/drivers/mfd/tps6586x.c
+++ b/drivers/mfd/tps6586x.c
@@ -432,8 +432,8 @@ static int __devinit tps6586x_irq_init(struct tps6586x *tps6586x, int irq,
#endif
}
- ret = request_threaded_irq(irq, NULL, tps6586x_irq, IRQF_ONESHOT,
- "tps6586x", tps6586x);
+ ret = devm_request_threaded_irq(tps6586x->dev, irq, NULL, tps6586x_irq,
+ IRQF_ONESHOT, "tps6586x", tps6586x);
if (!ret) {
device_init_wakeup(tps6586x->dev, 1);
@@ -579,9 +579,11 @@ static int __devinit tps6586x_i2c_probe(struct i2c_client *client,
dev_info(&client->dev, "VERSIONCRC is %02x\n", ret);
- tps6586x = kzalloc(sizeof(struct tps6586x), GFP_KERNEL);
- if (tps6586x == NULL)
+ tps6586x = devm_kzalloc(&client->dev, sizeof(*tps6586x), GFP_KERNEL);
+ if (tps6586x == NULL) {
+ dev_err(&client->dev, "memory for tps6586x alloc failed\n");
return -ENOMEM;
+ }
tps6586x->client = client;
tps6586x->dev = &client->dev;
@@ -594,14 +596,14 @@ static int __devinit tps6586x_i2c_probe(struct i2c_client *client,
pdata->irq_base);
if (ret) {
dev_err(&client->dev, "IRQ init failed: %d\n", ret);
- goto err_irq_init;
+ return ret;
}
}
ret = tps6586x_gpio_init(tps6586x, pdata->gpio_base);
if (ret) {
dev_err(&client->dev, "GPIO registration failed: %d\n", ret);
- goto err_gpio_init;
+ return ret;
}
ret = tps6586x_add_subdevs(tps6586x, pdata);
@@ -619,11 +621,6 @@ err_add_devs:
dev_err(&client->dev, "Can't remove gpio chip: %d\n",
ret);
}
-err_gpio_init:
- if (client->irq)
- free_irq(client->irq, tps6586x);
-err_irq_init:
- kfree(tps6586x);
return ret;
}
@@ -633,9 +630,6 @@ static int __devexit tps6586x_i2c_remove(struct i2c_client *client)
struct tps6586x_platform_data *pdata = client->dev.platform_data;
int ret;
- if (client->irq)
- free_irq(client->irq, tps6586x);
-
if (pdata->gpio_base) {
ret = gpiochip_remove(&tps6586x->gpio);
if (ret)
@@ -644,7 +638,6 @@ static int __devexit tps6586x_i2c_remove(struct i2c_client *client)
}
tps6586x_remove_subdevs(tps6586x);
- kfree(tps6586x);
return 0;
}
--
1.7.1.1
next prev parent reply other threads:[~2012-07-16 7:01 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-16 6:51 [PATCH V2 0/6] mfd: tp6586x: enhancements in the driver Laxman Dewangan
2012-07-16 6:51 ` Laxman Dewangan [this message]
2012-07-16 20:01 ` [PATCH V2 1/6] mfd: tps6586x:use devm managed resources Mark Brown
2012-07-17 4:42 ` Laxman Dewangan
2012-07-17 16:53 ` Mark Brown
2012-07-18 5:33 ` Laxman Dewangan
2012-07-16 6:51 ` [PATCH V2 2/6] mfd: Use regmap for tps6586x register access Laxman Dewangan
2012-07-16 20:02 ` Mark Brown
2012-07-16 6:51 ` [PATCH V2 3/6] mfd: tps6586x: cache register through regmap Laxman Dewangan
2012-07-16 20:03 ` Mark Brown
2012-07-17 4:28 ` Laxman Dewangan
2012-07-16 6:51 ` [PATCH V2 4/6] gpio: tps6586x: add gpio support through platform driver Laxman Dewangan
2012-07-16 6:51 ` [PATCH V2 5/6] ARM: tegra: defconfig: enable tps6586x gpio Laxman Dewangan
2012-07-16 22:35 ` Linus Walleij
2012-07-16 6:51 ` [PATCH V2 6/6] mfd: tps6586x: remove gpio support from core driver Laxman Dewangan
2012-07-16 22:35 ` Linus Walleij
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=1342421510-10638-2-git-send-email-ldewangan@nvidia.com \
--to=ldewangan@nvidia.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=grant.likely@secretlab.ca \
--cc=linus.walleij@stericsson.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sameo@linux.intel.com \
--cc=swarren@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).