From: Pekon Gupta <pekon@ti.com>
To: mark.rutland@arm.com, olof@lixom.net,
computersforpeace@gmail.com, dedekind1@gmail.com,
tony@atomide.com, bcousson@baylibre.com
Cc: robherring2@gmail.com, Pawel.Moll@arm.com,
ijc+devicetree@hellion.org.uk, swarren@wwwdotorg.org,
dwmw2@infradead.org, arnd@arndb.de, avinashphilipk@gmail.com,
balbi@ti.com, linux-mtd@lists.infradead.org,
linux-omap@vger.kernel.org, devicetree@vger.kernel.org,
Pekon Gupta <pekon@ti.com>
Subject: [PATCH v9 9/9] mtd: nand: omap: updated devm_xx for all resource allocation and free calls
Date: Tue, 15 Oct 2013 11:19:57 +0530 [thread overview]
Message-ID: <1381816197-20477-10-git-send-email-pekon@ti.com> (raw)
In-Reply-To: <1381816197-20477-1-git-send-email-pekon@ti.com>
"Managed Device Resource" or devm_xx calls takes care of automatic freeing
of the resource in case of:
- failure during driver probe
- failure during resource allocation
- detaching or unloading of driver module (rmmod)
Reference: Documentation/driver-model/devres.txt
Though OMAP NAND driver handles freeing of resource allocation in most of
the cases, but using devm_xx provides more clean and effortless approach
to handle all such cases.
Signed-off-by: Pekon Gupta <pekon@ti.com>
---
drivers/mtd/nand/omap2.c | 44 ++++++++++++++------------------------------
1 file changed, 14 insertions(+), 30 deletions(-)
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index 769ff65..0ed0d6f 100644
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -1642,7 +1642,8 @@ static int omap_nand_probe(struct platform_device *pdev)
return -ENODEV;
}
- info = kzalloc(sizeof(struct omap_nand_info), GFP_KERNEL);
+ info = devm_kzalloc(&pdev->dev, sizeof(struct omap_nand_info),
+ GFP_KERNEL);
if (!info)
return -ENOMEM;
@@ -1667,19 +1668,20 @@ static int omap_nand_probe(struct platform_device *pdev)
if (res == NULL) {
err = -EINVAL;
dev_err(&pdev->dev, "error getting memory resource\n");
- goto out_free_info;
+ goto out_release_mem_region;
}
info->phys_base = res->start;
info->mem_size = resource_size(res);
- if (!request_mem_region(info->phys_base, info->mem_size,
- pdev->dev.driver->name)) {
+ if (!devm_request_mem_region(&pdev->dev, info->phys_base,
+ info->mem_size, pdev->dev.driver->name)) {
err = -EBUSY;
- goto out_free_info;
+ goto out_release_mem_region;
}
- nand_chip->IO_ADDR_R = ioremap(info->phys_base, info->mem_size);
+ nand_chip->IO_ADDR_R = devm_ioremap(&pdev->dev, info->phys_base,
+ info->mem_size);
if (!nand_chip->IO_ADDR_R) {
err = -ENOMEM;
goto out_release_mem_region;
@@ -1781,8 +1783,9 @@ static int omap_nand_probe(struct platform_device *pdev)
err = -ENODEV;
goto out_release_mem_region;
}
- err = request_irq(info->gpmc_irq_fifo, omap_nand_irq,
- IRQF_SHARED, "gpmc-nand-fifo", info);
+ err = devm_request_irq(&pdev->dev, info->gpmc_irq_fifo,
+ omap_nand_irq, IRQF_SHARED,
+ "gpmc-nand-fifo", info);
if (err) {
dev_err(&pdev->dev, "requesting irq(%d) error:%d",
info->gpmc_irq_fifo, err);
@@ -1796,8 +1799,9 @@ static int omap_nand_probe(struct platform_device *pdev)
err = -ENODEV;
goto out_release_mem_region;
}
- err = request_irq(info->gpmc_irq_count, omap_nand_irq,
- IRQF_SHARED, "gpmc-nand-count", info);
+ err = devm_request_irq(&pdev->dev, info->gpmc_irq_count,
+ omap_nand_irq, IRQF_SHARED,
+ "gpmc-nand-count", info);
if (err) {
dev_err(&pdev->dev, "requesting irq(%d) error:%d",
info->gpmc_irq_count, err);
@@ -2010,45 +2014,25 @@ static int omap_nand_probe(struct platform_device *pdev)
out_release_mem_region:
if (info->dma)
dma_release_channel(info->dma);
- if (info->gpmc_irq_count > 0)
- free_irq(info->gpmc_irq_count, info);
- if (info->gpmc_irq_fifo > 0)
- free_irq(info->gpmc_irq_fifo, info);
- release_mem_region(info->phys_base, info->mem_size);
-out_free_info:
if (info->nand.ecc.priv) {
nand_bch_free(info->nand.ecc.priv);
info->nand.ecc.priv = NULL;
}
- kfree(info);
-
return err;
}
static int omap_nand_remove(struct platform_device *pdev)
{
struct mtd_info *mtd = platform_get_drvdata(pdev);
- struct nand_chip *nand_chip = mtd->priv;
struct omap_nand_info *info = container_of(mtd, struct omap_nand_info,
mtd);
if (info->nand.ecc.priv) {
nand_bch_free(info->nand.ecc.priv);
info->nand.ecc.priv = NULL;
}
-
if (info->dma)
dma_release_channel(info->dma);
-
- if (info->gpmc_irq_count > 0)
- free_irq(info->gpmc_irq_count, info);
- if (info->gpmc_irq_fifo > 0)
- free_irq(info->gpmc_irq_fifo, info);
-
- /* Release NAND device, its internal structures and partitions */
nand_release(mtd);
- iounmap(nand_chip->IO_ADDR_R);
- release_mem_region(info->phys_base, info->mem_size);
- kfree(info);
return 0;
}
--
1.8.1
next prev parent reply other threads:[~2013-10-15 5:49 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-15 5:49 [PATCH v9 0/9] mtd:nand:omap2: clean-up of supported ECC schemes Pekon Gupta
2013-10-15 5:49 ` [PATCH v9 1/9] mtd: nand: omap: combine different flavours of 1-bit hamming ecc schemes Pekon Gupta
2013-10-18 10:59 ` Mark Rutland
2013-10-18 11:48 ` Gupta, Pekon
2013-10-15 5:49 ` [PATCH v9 2/9] ARM: OMAP2+: cleaned-up DT support of various ECC schemes Pekon Gupta
2013-10-15 5:49 ` [PATCH v9 3/9] mtd: nand: omap: cleanup: replace local references with generic framework names Pekon Gupta
2013-10-16 21:30 ` Brian Norris
2013-10-19 5:10 ` Gupta, Pekon
2013-10-15 5:49 ` [PATCH v9 4/9] mtd: nand: omap: enable auto-detection of bus-width for omap-nand drivers Pekon Gupta
2013-10-16 22:22 ` Brian Norris
2013-10-17 4:42 ` Gupta, Pekon
2013-10-17 18:30 ` Brian Norris
2013-10-17 21:00 ` Gupta, Pekon
2013-10-17 21:26 ` Gupta, Pekon
2013-10-17 21:43 ` Brian Norris
2013-10-19 9:11 ` Gupta, Pekon
2013-10-15 5:49 ` [PATCH v9 5/9] mtd:nand:omap2: clean-up BCHx_HW and BCHx_SW ECC configurations in device_probe Pekon Gupta
2013-10-17 1:58 ` Brian Norris
2013-10-15 5:49 ` [PATCH v9 6/9] mtd: nand: omap: clean-up ecc layout for BCH ecc schemes Pekon Gupta
2013-10-17 2:06 ` Brian Norris
2013-10-15 5:49 ` [PATCH v9 7/9] mtd: nand: omap: use drivers/mtd/nand/nand_bch.c wrapper for BCH ECC instead of lib/bch.c Pekon Gupta
[not found] ` <1381816197-20477-8-git-send-email-pekon-l0cyMroinI0@public.gmane.org>
2013-10-17 2:22 ` Brian Norris
2013-10-17 10:14 ` Gupta, Pekon
2013-10-17 12:42 ` jean-philippe francois
2013-10-22 20:24 ` Brian Norris
2013-10-15 5:49 ` [PATCH v9 8/9] ARM: dts: AM33xx: updated default ECC scheme in nand-ecc-opt Pekon Gupta
2013-10-15 5:49 ` Pekon Gupta [this message]
2013-10-17 2:29 ` [PATCH v9 9/9] mtd: nand: omap: updated devm_xx for all resource allocation and free calls Brian Norris
2013-10-16 18:48 ` [PATCH v9 0/9] mtd:nand:omap2: clean-up of supported ECC schemes Gupta, Pekon
2013-10-17 2:35 ` 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=1381816197-20477-10-git-send-email-pekon@ti.com \
--to=pekon@ti.com \
--cc=Pawel.Moll@arm.com \
--cc=arnd@arndb.de \
--cc=avinashphilipk@gmail.com \
--cc=balbi@ti.com \
--cc=bcousson@baylibre.com \
--cc=computersforpeace@gmail.com \
--cc=dedekind1@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=dwmw2@infradead.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=olof@lixom.net \
--cc=robherring2@gmail.com \
--cc=swarren@wwwdotorg.org \
--cc=tony@atomide.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).