From: Jingoo Han <jg1.han@samsung.com>
To: 'Brian Norris' <computersforpeace@gmail.com>
Cc: linux-mtd@lists.infradead.org,
'Robert Jarzmik' <robert.jarzmik@free.fr>,
'Jingoo Han' <jg1.han@samsung.com>,
'David Woodhouse' <dwmw2@infradead.org>
Subject: [PATCH V3 1/8] mtd: docg3: Use devm_*() functions
Date: Thu, 26 Dec 2013 10:40:52 +0900 [thread overview]
Message-ID: <007901cf01db$8362f580$8a28e080$%han@samsung.com> (raw)
Use devm_*() functions to make cleanup paths simpler.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
No change since v2.
drivers/mtd/devices/docg3.c | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/drivers/mtd/devices/docg3.c b/drivers/mtd/devices/docg3.c
index 4f091c1..dd5e101 100644
--- a/drivers/mtd/devices/docg3.c
+++ b/drivers/mtd/devices/docg3.c
@@ -2047,21 +2047,21 @@ static int __init docg3_probe(struct platform_device *pdev)
ress = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!ress) {
dev_err(dev, "No I/O memory resource defined\n");
- goto noress;
+ return ret;
}
- base = ioremap(ress->start, DOC_IOSPACE_SIZE);
+ base = devm_ioremap(dev, ress->start, DOC_IOSPACE_SIZE);
ret = -ENOMEM;
- cascade = kzalloc(sizeof(*cascade) * DOC_MAX_NBFLOORS,
- GFP_KERNEL);
+ cascade = devm_kzalloc(dev, sizeof(*cascade) * DOC_MAX_NBFLOORS,
+ GFP_KERNEL);
if (!cascade)
- goto nomem1;
+ return ret;
cascade->base = base;
mutex_init(&cascade->lock);
cascade->bch = init_bch(DOC_ECC_BCH_M, DOC_ECC_BCH_T,
DOC_ECC_BCH_PRIMPOLY);
if (!cascade->bch)
- goto nomem2;
+ return ret;
for (floor = 0; floor < DOC_MAX_NBFLOORS; floor++) {
mtd = doc_probe_device(cascade, floor, dev);
@@ -2101,11 +2101,6 @@ err_probe:
for (floor = 0; floor < DOC_MAX_NBFLOORS; floor++)
if (cascade->floors[floor])
doc_release_device(cascade->floors[floor]);
-nomem2:
- kfree(cascade);
-nomem1:
- iounmap(base);
-noress:
return ret;
}
@@ -2119,7 +2114,6 @@ static int __exit docg3_release(struct platform_device *pdev)
{
struct docg3_cascade *cascade = platform_get_drvdata(pdev);
struct docg3 *docg3 = cascade->floors[0]->priv;
- void __iomem *base = cascade->base;
int floor;
doc_unregister_sysfs(pdev, cascade);
@@ -2129,8 +2123,6 @@ static int __exit docg3_release(struct platform_device *pdev)
doc_release_device(cascade->floors[floor]);
free_bch(docg3->cascade->bch);
- kfree(cascade);
- iounmap(base);
return 0;
}
--
1.7.10.4
next reply other threads:[~2013-12-26 1:41 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-26 1:40 Jingoo Han [this message]
2013-12-26 1:41 ` [PATCH V3 2/8] mtd: ixp4xx: Use devm_*() functions Jingoo Han
2013-12-26 1:42 ` [PATCH V3 3/8] mtd: lantiq-flash: Use devm_kzalloc() Jingoo Han
2013-12-26 1:43 ` [PATCH V3 4/8] mtd: denali_dt: Use devm_clk_get() Jingoo Han
2013-12-26 1:44 ` [PATCH V3 5/8] mtd: lpc32xx_slc: Use devm_*() functions Jingoo Han
2013-12-26 10:30 ` Roland Stigge
2013-12-26 1:44 ` [PATCH V3 6/8] mtd: nuc900_nand: " Jingoo Han
2013-12-26 1:45 ` [PATCH V3 7/8] mtd: plat_nand: " Jingoo Han
2013-12-26 1:45 ` [PATCH V3 8/8] mtd: tmio_nand: " Jingoo Han
2014-01-08 10:31 ` Ian Molton
2014-01-03 1:24 ` [PATCH V3 1/8] mtd: docg3: " Brian Norris
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='007901cf01db$8362f580$8a28e080$%han@samsung.com' \
--to=jg1.han@samsung.com \
--cc=computersforpeace@gmail.com \
--cc=dwmw2@infradead.org \
--cc=linux-mtd@lists.infradead.org \
--cc=robert.jarzmik@free.fr \
/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.