From: Pekon Gupta <pekon@ti.com>
To: mark.rutland@arm.com, robherring2@gmail.com, olof@lixom.net,
computersforpeace@gmail.com, dedekind1@gmail.com
Cc: Pawel.Moll@arm.com, ijc+devicetree@hellion.org.uk,
swarren@wwwdotorg.org, dwmw2@infradead.org, arnd@arndb.de,
tony@atomide.com, bcousson@baylibre.com,
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 v8 6/6] mtd: nand: omap: updated devm_xx for all resource allocation and free calls
Date: Fri, 11 Oct 2013 19:06:43 +0530 [thread overview]
Message-ID: <1381498603-15715-7-git-send-email-pekon@ti.com> (raw)
In-Reply-To: <1381498603-15715-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 | 38 +++++++++++++++++++++-----------------
1 file changed, 21 insertions(+), 17 deletions(-)
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index a783dae..0f2b0d1 100644
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -1658,7 +1658,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;
@@ -1690,13 +1691,14 @@ static int omap_nand_probe(struct platform_device *pdev)
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;
}
- info->nand.IO_ADDR_R = ioremap(info->phys_base, info->mem_size);
+ info->nand.IO_ADDR_R = devm_ioremap(&pdev->dev, info->phys_base,
+ info->mem_size);
if (!info->nand.IO_ADDR_R) {
err = -ENOMEM;
goto out_release_mem_region;
@@ -1799,8 +1801,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);
@@ -1814,8 +1817,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);
@@ -2031,10 +2035,10 @@ 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);
+ devm_free_irq(&pdev->dev, 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);
+ devm_free_irq(&pdev->dev, info->gpmc_irq_fifo, info);
+ devm_release_mem_region(&pdev->dev, info->phys_base, info->mem_size);
out_free_info:
#ifdef CONFIG_MTD_NAND_ECC_BCH
if (info->nand.ecc.priv) {
@@ -2042,7 +2046,7 @@ out_free_info:
info->nand.ecc.priv = NULL;
}
#endif
- kfree(info);
+ devm_kfree(&pdev->dev, info);
return err;
}
@@ -2062,15 +2066,15 @@ static int omap_nand_remove(struct platform_device *pdev)
dma_release_channel(info->dma);
if (info->gpmc_irq_count > 0)
- free_irq(info->gpmc_irq_count, info);
+ devm_free_irq(&pdev->dev, info->gpmc_irq_count, info);
if (info->gpmc_irq_fifo > 0)
- free_irq(info->gpmc_irq_fifo, info);
+ devm_free_irq(&pdev->dev, info->gpmc_irq_fifo, info);
/* Release NAND device, its internal structures and partitions */
nand_release(&info->mtd);
- iounmap(info->nand.IO_ADDR_R);
- release_mem_region(info->phys_base, info->mem_size);
- kfree(info);
+ devm_iounmap(&pdev->dev, info->nand.IO_ADDR_R);
+ devm_release_mem_region(&pdev->dev, info->phys_base, info->mem_size);
+ devm_kfree(&pdev->dev, info);
return 0;
}
--
1.8.1
next prev parent reply other threads:[~2013-10-11 13:36 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-11 13:36 [PATCH v8 0/6] mtd:nand:omap2: clean-up of supported ECC schemes Pekon Gupta
2013-10-11 13:36 ` [PATCH v8 1/6] mtd: nand: omap: combine different flavours of 1-bit hamming ecc schemes Pekon Gupta
2013-10-11 15:55 ` Felipe Balbi
2013-10-11 18:33 ` Tony Lindgren
2013-10-11 13:36 ` [PATCH v8 2/6] ARM: OMAP2+: cleaned-up DT support of various ECC schemes Pekon Gupta
2013-10-11 15:55 ` Felipe Balbi
2013-10-11 18:32 ` Tony Lindgren
2013-10-11 13:36 ` [PATCH v8 3/6] mtd:nand:omap2: clean-up BCHx_HW and BCHx_SW ECC configurations in device_probe Pekon Gupta
2013-10-11 15:55 ` Felipe Balbi
2013-10-11 19:28 ` Brian Norris
2013-10-12 23:58 ` Gupta, Pekon
2013-10-13 1:40 ` Brian Norris
2013-10-11 13:36 ` [PATCH v8 4/6] mtd:nand:omap2: updated support for BCH4 ECC scheme Pekon Gupta
2013-10-11 15:55 ` Felipe Balbi
2013-10-11 20:28 ` Brian Norris
2013-10-11 13:36 ` [PATCH v8 5/6] ARM: dts: AM33xx: updated default ECC scheme in nand-ecc-opt Pekon Gupta
2013-10-11 15:56 ` Felipe Balbi
2013-10-11 13:36 ` Pekon Gupta [this message]
2013-10-11 15:56 ` [PATCH v8 6/6] mtd: nand: omap: updated devm_xx for all resource allocation and free calls Felipe Balbi
2013-10-11 18:15 ` Brian Norris
2013-10-11 18:28 ` Tony Lindgren
2013-10-11 19:27 ` Brian Norris
2013-10-11 21:46 ` Tony Lindgren
2013-10-11 22:14 ` Brian Norris
2013-10-11 21:09 ` [PATCH v8 0/6] mtd:nand:omap2: clean-up of supported ECC schemes Brian Norris
2013-10-12 22:26 ` Gupta, Pekon
2013-10-13 1:40 ` 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=1381498603-15715-7-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).