From: Boris Brezillon <boris.brezillon@collabora.com>
To: Miquel Raynal <miquel.raynal@bootlin.com>,
linux-mtd@lists.infradead.org, Lubomir Rintel <lkundrak@v3.sk>
Cc: Richard Weinberger <richard@nod.at>,
Boris Brezillon <boris.brezillon@collabora.com>,
Vignesh Raghavendra <vigneshr@ti.com>,
Tudor Ambarus <tudor.ambarus@microchip.com>
Subject: [PATCH v2 09/19] mtd: rawnand: cafe: Use devm_kzalloc and devm_request_irq()
Date: Tue, 5 May 2020 12:13:43 +0200 [thread overview]
Message-ID: <20200505101353.1776394-10-boris.brezillon@collabora.com> (raw)
In-Reply-To: <20200505101353.1776394-1-boris.brezillon@collabora.com>
This simplifies the error/remove path.
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
Tested-by: Lubomir Rintel <lkundrak@v3.sk>
---
Changes in v2:
* Add R-b/T-b
---
drivers/mtd/nand/raw/cafe_nand.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/drivers/mtd/nand/raw/cafe_nand.c b/drivers/mtd/nand/raw/cafe_nand.c
index fedf434a563f..93e8e124df45 100644
--- a/drivers/mtd/nand/raw/cafe_nand.c
+++ b/drivers/mtd/nand/raw/cafe_nand.c
@@ -846,7 +846,7 @@ static int cafe_nand_probe(struct pci_dev *pdev,
pci_set_master(pdev);
- cafe = kzalloc(sizeof(*cafe), GFP_KERNEL);
+ cafe = devm_kzalloc(&pdev->dev, sizeof(*cafe), GFP_KERNEL);
if (!cafe)
return -ENOMEM;
@@ -858,8 +858,7 @@ static int cafe_nand_probe(struct pci_dev *pdev,
cafe->mmio = pci_iomap(pdev, 0, 0);
if (!cafe->mmio) {
dev_warn(&pdev->dev, "failed to iomap\n");
- err = -ENOMEM;
- goto out_free_mtd;
+ return -ENOMEM;
}
cafe->rs = init_rs_non_canonical(12, &cafe_mul, 0, 1, 8);
@@ -908,8 +907,8 @@ static int cafe_nand_probe(struct pci_dev *pdev,
cafe_nand_init(cafe);
- err = request_irq(pdev->irq, &cafe_nand_interrupt, IRQF_SHARED,
- "CAFE NAND", mtd);
+ err = devm_request_irq(&pdev->dev, pdev->irq, cafe_nand_interrupt,
+ IRQF_SHARED, "CAFE NAND", mtd);
if (err) {
dev_warn(&pdev->dev, "Could not register IRQ %d\n", pdev->irq);
goto out_ior;
@@ -940,11 +939,8 @@ static int cafe_nand_probe(struct pci_dev *pdev,
cafe_writel(cafe,
cafe_readl(cafe, GLOBAL_IRQ_MASK) & ~CAFE_GLOBAL_IRQ_NAND,
GLOBAL_IRQ_MASK);
- free_irq(pdev->irq, mtd);
out_ior:
pci_iounmap(pdev, cafe->mmio);
- out_free_mtd:
- kfree(cafe);
out:
return err;
}
@@ -959,12 +955,10 @@ static void cafe_nand_remove(struct pci_dev *pdev)
cafe_writel(cafe,
cafe_readl(cafe, GLOBAL_IRQ_MASK) & ~CAFE_GLOBAL_IRQ_NAND,
GLOBAL_IRQ_MASK);
- free_irq(pdev->irq, mtd);
nand_release(chip);
free_rs(cafe->rs);
pci_iounmap(pdev, cafe->mmio);
dma_free_coherent(&cafe->pdev->dev, 2112, cafe->dmabuf, cafe->dmaaddr);
- kfree(cafe);
}
static const struct pci_device_id cafe_nand_tbl[] = {
--
2.25.3
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2020-05-05 10:16 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-05 10:13 [PATCH v2 00/19] mtd: rawnand: cafe: Convert to exec_op() (and more) Boris Brezillon
2020-05-05 10:13 ` [PATCH v2 01/19] mtd: rawnand: Propage CS selection to sub operations Boris Brezillon
2020-05-24 19:17 ` Miquel Raynal
2020-05-05 10:13 ` [PATCH v2 02/19] mtd: rawnand: cafe: Get rid of an inaccurate kernel doc header Boris Brezillon
2020-05-05 10:13 ` [PATCH v2 03/19] mtd: rawnand: cafe: Rename cafe_nand_write_page_lowlevel() Boris Brezillon
2020-05-05 10:13 ` [PATCH v2 04/19] mtd: rawnand: cafe: Use a correct ECC mode and pass the ECC alg Boris Brezillon
2020-05-05 10:13 ` [PATCH v2 05/19] mtd: rawnand: cafe: Include linux/io.h instead of asm/io.h Boris Brezillon
2020-05-05 10:13 ` [PATCH v2 06/19] mtd: rawnand: cafe: Demistify register fields Boris Brezillon
[not found] ` <20200506204638.GB207924@furthur.local>
2020-05-06 20:53 ` Boris Brezillon
2020-05-05 10:13 ` [PATCH v2 07/19] mtd: rawnand: cafe: Factor out the controller initialization logic Boris Brezillon
2020-05-10 21:49 ` Miquel Raynal
2020-05-05 10:13 ` [PATCH v2 08/19] mtd: rawnand: cafe: Get rid of the debug module param Boris Brezillon
2020-05-05 10:13 ` Boris Brezillon [this message]
2020-05-05 10:13 ` [PATCH v2 10/19] mtd: rawnand: cafe: Get rid of a useless label Boris Brezillon
2020-05-05 10:13 ` [PATCH v2 11/19] mtd: rawnand: cafe: Explicitly inherit from nand_controller Boris Brezillon
2020-05-05 10:13 ` [PATCH v2 12/19] mtd: rawnand: cafe: Don't leave ECC enabled in the write path Boris Brezillon
2020-05-05 10:13 ` [PATCH v2 13/19] mtd: rawnand: cafe: Don't split things when reading/writing a page Boris Brezillon
2020-05-10 21:49 ` Miquel Raynal
2020-05-05 10:13 ` [PATCH v2 14/19] mtd: rawnand: cafe: Add exec_op() support Boris Brezillon
2020-05-05 10:13 ` [PATCH v2 15/19] mtd: rawnand: cafe: Get rid of the legacy interface implementation Boris Brezillon
2020-05-05 10:13 ` [PATCH v2 16/19] mtd: rawnand: cafe: Adjust the cafe_{read, write}_buf() prototypes Boris Brezillon
2020-05-05 10:13 ` [PATCH v2 17/19] mtd: rawnand: cafe: s/uint{8,16,32}_t/u{8,16,32}/ Boris Brezillon
2020-05-05 10:13 ` [PATCH v2 18/19] mtd: rawnand: cafe: Drop the cafe_{readl, writel}() wrappers Boris Brezillon
2020-05-10 21:45 ` [PATCH v2 18/19] mtd: rawnand: cafe: Drop the cafe_{readl,writel}() wrappers Miquel Raynal
2020-05-05 10:13 ` [PATCH v2 19/19] mtd: rawnand: cafe: Get rid of the last printk() Boris Brezillon
2020-05-10 21:43 ` Miquel Raynal
[not found] ` <20200505144639.GB1997@furthur.local>
[not found] ` <20200505220152.GA157445@furthur.local>
2020-05-06 6:32 ` [PATCH v2 00/19] mtd: rawnand: cafe: Convert to exec_op() (and more) Boris Brezillon
[not found] ` <20200506155359.GA183666@furthur.local>
2020-05-06 16:11 ` Boris Brezillon
[not found] ` <20200506203635.GA207924@furthur.local>
2020-05-06 20:58 ` Boris Brezillon
2020-05-06 21:35 ` Boris Brezillon
[not found] ` <20200507134708.GA303404@furthur.local>
2020-05-07 14:11 ` Boris Brezillon
2020-05-07 20:12 ` Boris Brezillon
[not found] ` <20200509193440.GA524772@furthur.local>
2020-05-09 20:01 ` Boris Brezillon
[not found] ` <20200509202855.GB524772@furthur.local>
2020-05-10 6:31 ` Boris Brezillon
2020-05-10 6:45 ` Boris Brezillon
[not found] ` <20200510072108.GA587379@furthur.local>
2020-05-10 7:35 ` Boris Brezillon
2020-05-11 8:23 ` Boris Brezillon
[not found] ` <20200512164057.GC604838@furthur.local>
2020-05-12 19:50 ` Boris Brezillon
2020-05-13 17:10 ` Boris Brezillon
[not found] ` <20200515144703.GA1245784@furthur.local>
[not found] ` <20200515192540.GB1245784@furthur.local>
[not found] ` <20200516145650.GA1433661@furthur.local>
2020-05-16 19:08 ` Boris Brezillon
2020-05-16 20:18 ` Boris Brezillon
[not found] ` <20200517164709.GA1651421@furthur.local>
2020-05-18 14:50 ` Boris Brezillon
[not found] ` <20200520072331.GJ1695525@furthur.local>
2020-05-20 7:55 ` Boris Brezillon
[not found] ` <20200524115246.GC2781@furthur.local>
2020-05-24 14:55 ` Boris Brezillon
2020-05-24 15:05 ` Boris Brezillon
2020-05-24 15:29 ` Boris Brezillon
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=20200505101353.1776394-10-boris.brezillon@collabora.com \
--to=boris.brezillon@collabora.com \
--cc=linux-mtd@lists.infradead.org \
--cc=lkundrak@v3.sk \
--cc=miquel.raynal@bootlin.com \
--cc=richard@nod.at \
--cc=tudor.ambarus@microchip.com \
--cc=vigneshr@ti.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).