From: Aaro Koskinen <aaro.koskinen@iki.fi>
To: wim@iguana.be, linux-watchdog@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org
Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
Subject: [RESEND PATCH v3 2/6] watchdog: omap_wdt: convert kzalloc() to devm_kzalloc()
Date: Thu, 25 Oct 2012 18:19:08 +0300 [thread overview]
Message-ID: <1351178352-3989-3-git-send-email-aaro.koskinen@iki.fi> (raw)
In-Reply-To: <1351178352-3989-1-git-send-email-aaro.koskinen@iki.fi>
Use devm_kzalloc() to simplify the code.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
---
drivers/watchdog/omap_wdt.c | 23 ++++++-----------------
1 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index d28ad5e..d6722db 100644
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -208,24 +208,20 @@ static int __devinit omap_wdt_probe(struct platform_device *pdev)
struct omap_wdt_dev *wdev;
int ret;
- omap_wdt = kzalloc(sizeof(*omap_wdt), GFP_KERNEL);
+ omap_wdt = devm_kzalloc(&pdev->dev, sizeof(*omap_wdt), GFP_KERNEL);
if (!omap_wdt)
return -ENOMEM;
/* reserve static register mappings */
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- if (!res) {
- ret = -ENOENT;
- goto err_get_resource;
- }
+ if (!res)
+ return -ENOENT;
mem = request_mem_region(res->start, resource_size(res), pdev->name);
- if (!mem) {
- ret = -EBUSY;
- goto err_busy;
- }
+ if (!mem)
+ return -EBUSY;
- wdev = kzalloc(sizeof(struct omap_wdt_dev), GFP_KERNEL);
+ wdev = devm_kzalloc(&pdev->dev, sizeof(*wdev), GFP_KERNEL);
if (!wdev) {
ret = -ENOMEM;
goto err_kzalloc;
@@ -292,14 +288,10 @@ err_misc:
err_ioremap:
wdev->base = NULL;
- kfree(wdev);
err_kzalloc:
release_mem_region(res->start, resource_size(res));
-err_busy:
-err_get_resource:
- kfree(omap_wdt);
return ret;
}
@@ -329,9 +321,6 @@ static int __devexit omap_wdt_remove(struct platform_device *pdev)
iounmap(wdev->base);
- kfree(wdev);
- kfree(wdog);
-
return 0;
}
--
1.7.2.5
next prev parent reply other threads:[~2012-10-25 15:19 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-25 15:19 [RESEND PATCH v3 0/6] watchdog: omap_wdt: convert to new watchdog core Aaro Koskinen
2012-10-25 15:19 ` [RESEND PATCH v3 1/6] " Aaro Koskinen
2012-10-25 15:19 ` Aaro Koskinen [this message]
2012-10-25 15:19 ` [RESEND PATCH v3 3/6] watchdog: omap_wdt: convert request_mem_region() to devm_request_mem_region() Aaro Koskinen
2012-10-25 15:19 ` [RESEND PATCH v3 4/6] watchdog: omap_wdt: convert ioremap() to devm_ioremap() Aaro Koskinen
2012-10-25 15:19 ` [RESEND PATCH v3 5/6] watchdog: omap_wdt: delete redundant platform_set_drvdata() calls Aaro Koskinen
2012-10-25 15:19 ` [RESEND PATCH v3 6/6] watchdog: omap_wdt: eliminate goto Aaro Koskinen
2012-11-12 18:46 [RESEND PATCH v3 0/6] watchdog: omap_wdt: convert to new watchdog core Aaro Koskinen
2012-11-12 18:47 ` [RESEND PATCH v3 2/6] watchdog: omap_wdt: convert kzalloc() to devm_kzalloc() Aaro Koskinen
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=1351178352-3989-3-git-send-email-aaro.koskinen@iki.fi \
--to=aaro.koskinen@iki.fi \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=wim@iguana.be \
/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).