All of lore.kernel.org
 help / color / mirror / Atom feed
From: Boris Brezillon <boris.brezillon@collabora.com>
To: Anton Vorontsov <anton@enomsg.org>,
	Miquel Raynal <miquel.raynal@bootlin.com>,
	linux-mtd@lists.infradead.org
Cc: Vignesh Raghavendra <vigneshr@ti.com>,
	Tudor Ambarus <tudor.ambarus@microchip.com>,
	Richard Weinberger <richard@nod.at>,
	Boris Brezillon <boris.brezillon@collabora.com>,
	Paul Mackerras <paulus@samba.org>,
	linuxppc-dev@lists.ozlabs.org
Subject: [PATCH 04/10] mtd: rawnand: fsl_upm: Use devm_kasprintf() to allocate the MTD name
Date: Wed,  3 Jun 2020 15:49:16 +0200	[thread overview]
Message-ID: <20200603134922.1352340-5-boris.brezillon@collabora.com> (raw)
In-Reply-To: <20200603134922.1352340-1-boris.brezillon@collabora.com>

This simplifies the init() error path and the remove() handler.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
---
 drivers/mtd/nand/raw/fsl_upm.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/mtd/nand/raw/fsl_upm.c b/drivers/mtd/nand/raw/fsl_upm.c
index 9cf79c62ef22..a3e3a968891d 100644
--- a/drivers/mtd/nand/raw/fsl_upm.c
+++ b/drivers/mtd/nand/raw/fsl_upm.c
@@ -176,8 +176,9 @@ static int fun_chip_init(struct fsl_upm_nand *fun,
 		return -ENODEV;
 
 	nand_set_flash_node(&fun->chip, flash_np);
-	mtd->name = kasprintf(GFP_KERNEL, "0x%llx.%pOFn", (u64)io_res->start,
-			      flash_np);
+	mtd->name = devm_kasprintf(fun->dev, GFP_KERNEL, "0x%llx.%pOFn",
+				   (u64)io_res->start,
+				   flash_np);
 	if (!mtd->name) {
 		ret = -ENOMEM;
 		goto err;
@@ -190,8 +191,6 @@ static int fun_chip_init(struct fsl_upm_nand *fun,
 	ret = mtd_device_register(mtd, NULL, 0);
 err:
 	of_node_put(flash_np);
-	if (ret)
-		kfree(mtd->name);
 	return ret;
 }
 
@@ -318,7 +317,6 @@ static int fun_remove(struct platform_device *ofdev)
 	ret = mtd_device_unregister(mtd);
 	WARN_ON(ret);
 	nand_cleanup(chip);
-	kfree(mtd->name);
 
 	for (i = 0; i < fun->mchip_count; i++) {
 		if (fun->rnb_gpio[i] < 0)
-- 
2.25.4


WARNING: multiple messages have this Message-ID (diff)
From: Boris Brezillon <boris.brezillon@collabora.com>
To: Anton Vorontsov <anton@enomsg.org>,
	Miquel Raynal <miquel.raynal@bootlin.com>,
	linux-mtd@lists.infradead.org
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
	Vignesh Raghavendra <vigneshr@ti.com>,
	Tudor Ambarus <tudor.ambarus@microchip.com>,
	Richard Weinberger <richard@nod.at>,
	Boris Brezillon <boris.brezillon@collabora.com>,
	Paul Mackerras <paulus@samba.org>,
	Michael Ellerman <mpe@ellerman.id.au>,
	linuxppc-dev@lists.ozlabs.org
Subject: [PATCH 04/10] mtd: rawnand: fsl_upm: Use devm_kasprintf() to allocate the MTD name
Date: Wed,  3 Jun 2020 15:49:16 +0200	[thread overview]
Message-ID: <20200603134922.1352340-5-boris.brezillon@collabora.com> (raw)
In-Reply-To: <20200603134922.1352340-1-boris.brezillon@collabora.com>

This simplifies the init() error path and the remove() handler.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
---
 drivers/mtd/nand/raw/fsl_upm.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/mtd/nand/raw/fsl_upm.c b/drivers/mtd/nand/raw/fsl_upm.c
index 9cf79c62ef22..a3e3a968891d 100644
--- a/drivers/mtd/nand/raw/fsl_upm.c
+++ b/drivers/mtd/nand/raw/fsl_upm.c
@@ -176,8 +176,9 @@ static int fun_chip_init(struct fsl_upm_nand *fun,
 		return -ENODEV;
 
 	nand_set_flash_node(&fun->chip, flash_np);
-	mtd->name = kasprintf(GFP_KERNEL, "0x%llx.%pOFn", (u64)io_res->start,
-			      flash_np);
+	mtd->name = devm_kasprintf(fun->dev, GFP_KERNEL, "0x%llx.%pOFn",
+				   (u64)io_res->start,
+				   flash_np);
 	if (!mtd->name) {
 		ret = -ENOMEM;
 		goto err;
@@ -190,8 +191,6 @@ static int fun_chip_init(struct fsl_upm_nand *fun,
 	ret = mtd_device_register(mtd, NULL, 0);
 err:
 	of_node_put(flash_np);
-	if (ret)
-		kfree(mtd->name);
 	return ret;
 }
 
@@ -318,7 +317,6 @@ static int fun_remove(struct platform_device *ofdev)
 	ret = mtd_device_unregister(mtd);
 	WARN_ON(ret);
 	nand_cleanup(chip);
-	kfree(mtd->name);
 
 	for (i = 0; i < fun->mchip_count; i++) {
 		if (fun->rnb_gpio[i] < 0)
-- 
2.25.4


______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

  parent reply	other threads:[~2020-06-03 14:44 UTC|newest]

Thread overview: 65+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-03 13:49 [PATCH 00/10] mtd: rawnand: fsl_upm: Convert to exec_op() (and more) Boris Brezillon
2020-06-03 13:49 ` Boris Brezillon
2020-06-03 13:49 ` [PATCH 01/10] mtd: rawnand: fsl_upm: Remove unused mtd var Boris Brezillon
2020-06-03 13:49   ` Boris Brezillon
2020-06-03 13:50   ` Miquel Raynal
2020-06-03 13:50     ` Miquel Raynal
2020-06-15  9:02   ` Miquel Raynal
2020-06-15  9:02     ` Miquel Raynal
2020-06-03 13:49 ` [PATCH 02/10] mtd: rawnand: fsl_upm: Get rid of the unused fsl_upm_nand.parts field Boris Brezillon
2020-06-03 13:49   ` Boris Brezillon
2020-06-03 13:50   ` Miquel Raynal
2020-06-03 13:50     ` Miquel Raynal
2020-06-15  9:02   ` Miquel Raynal
2020-06-15  9:02     ` Miquel Raynal
2020-06-03 13:49 ` [PATCH 03/10] mtd: rawnand: fsl_upm: Allocate the fsl_upm_nand object using devm_kzalloc() Boris Brezillon
2020-06-03 13:49   ` Boris Brezillon
2020-06-03 13:52   ` Miquel Raynal
2020-06-03 13:52     ` Miquel Raynal
2020-06-15  9:02   ` Miquel Raynal
2020-06-15  9:02     ` Miquel Raynal
2020-06-03 13:49 ` Boris Brezillon [this message]
2020-06-03 13:49   ` [PATCH 04/10] mtd: rawnand: fsl_upm: Use devm_kasprintf() to allocate the MTD name Boris Brezillon
2020-06-03 13:55   ` Miquel Raynal
2020-06-03 13:55     ` Miquel Raynal
2020-06-03 13:59     ` Boris Brezillon
2020-06-03 13:59       ` Boris Brezillon
2020-06-15  9:02   ` Miquel Raynal
2020-06-15  9:02     ` Miquel Raynal
2020-06-03 13:49 ` [PATCH 05/10] mtd: rawnand: fsl_upm: Use platform_get_resource() + devm_ioremap_resource() Boris Brezillon
2020-06-03 13:49   ` Boris Brezillon
2020-06-03 13:58   ` Miquel Raynal
2020-06-03 13:58     ` Miquel Raynal
2020-06-03 14:00     ` Boris Brezillon
2020-06-03 14:00       ` Boris Brezillon
2020-06-15  9:01   ` Miquel Raynal
2020-06-15  9:01     ` Miquel Raynal
2020-06-03 13:49 ` [PATCH 06/10] mtd: rawnand: fsl_upm: Use gpio descriptors Boris Brezillon
2020-06-03 13:49   ` Boris Brezillon
2020-06-03 13:59   ` Miquel Raynal
2020-06-03 13:59     ` Miquel Raynal
2020-06-15  9:01   ` Miquel Raynal
2020-06-15  9:01     ` Miquel Raynal
2020-06-03 13:49 ` [PATCH 07/10] mtd: rawnand: fsl_upm: Inherit from nand_controller Boris Brezillon
2020-06-03 13:49   ` Boris Brezillon
2020-06-03 14:01   ` Miquel Raynal
2020-06-03 14:01     ` Miquel Raynal
2020-06-15  9:01   ` Miquel Raynal
2020-06-15  9:01     ` Miquel Raynal
2020-06-03 13:49 ` [PATCH 08/10] mtd: rawnand: fsl_upm: Implement exec_op() Boris Brezillon
2020-06-03 13:49   ` Boris Brezillon
2020-06-03 14:08   ` Miquel Raynal
2020-06-03 14:08     ` Miquel Raynal
2020-06-15  9:01   ` Miquel Raynal
2020-06-15  9:01     ` Miquel Raynal
2020-06-03 13:49 ` [PATCH 09/10] mtd: rawnand: fsl_upm: Get rid of the legacy interface implementation Boris Brezillon
2020-06-03 13:49   ` Boris Brezillon
2020-06-15  9:01   ` Miquel Raynal
2020-06-15  9:01     ` Miquel Raynal
2020-06-03 13:49 ` [PATCH 10/10] dt-bindings: mtd: fsl-upm-nand: Deprecate chip-delay and fsl, upm-wait-flags Boris Brezillon
2020-06-03 13:49   ` Boris Brezillon
2020-06-03 13:52   ` [PATCH 10/10] dt-bindings: mtd: fsl-upm-nand: Deprecate chip-delay and fsl,upm-wait-flags Boris Brezillon
2020-06-03 13:52     ` Boris Brezillon
2020-06-03 13:52     ` Boris Brezillon
2020-07-07 19:04   ` [PATCH 10/10] dt-bindings: mtd: fsl-upm-nand: Deprecate chip-delay and fsl, upm-wait-flags Miquel Raynal
2020-07-07 19:04     ` Miquel Raynal

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=20200603134922.1352340-5-boris.brezillon@collabora.com \
    --to=boris.brezillon@collabora.com \
    --cc=anton@enomsg.org \
    --cc=linux-mtd@lists.infradead.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=miquel.raynal@bootlin.com \
    --cc=paulus@samba.org \
    --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 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.