From: Boris Brezillon <boris.brezillon@bootlin.com>
To: David Woodhouse <dwmw2@infradead.org>,
Brian Norris <computersforpeace@gmail.com>,
Boris Brezillon <boris.brezillon@bootlin.com>,
Marek Vasut <marek.vasut@gmail.com>,
Richard Weinberger <richard@nod.at>,
linux-mtd@lists.infradead.org
Cc: Rob Herring <robh+dt@kernel.org>, Pawel Moll <pawel.moll@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
Kumar Gala <galak@codeaurora.org>,
devicetree@vger.kernel.org,
Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>,
Linus Walleij <linus.walleij@linaro.org>
Subject: [PATCH v2 07/15] mtd: maps: physmap: Check mtd_device_{parse_register, unregister}() ret code
Date: Fri, 19 Oct 2018 09:49:00 +0200 [thread overview]
Message-ID: <20181019074908.13226-8-boris.brezillon@bootlin.com> (raw)
In-Reply-To: <20181019074908.13226-1-boris.brezillon@bootlin.com>
mtd_device_parse_register() and mtd_device_unregister() can fail,
check their return code and propagate the error to the upper layer
if needed.
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Reviewed-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
Changes in v2:
- Add Ricardo's R-b
---
drivers/mtd/maps/physmap.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index 86679d149a49..9b34223c4635 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -35,7 +35,7 @@ static int physmap_flash_remove(struct platform_device *dev)
{
struct physmap_flash_info *info;
struct physmap_flash_data *physmap_data;
- int i;
+ int i, err;
info = platform_get_drvdata(dev);
if (info == NULL)
@@ -44,7 +44,10 @@ static int physmap_flash_remove(struct platform_device *dev)
physmap_data = dev_get_platdata(&dev->dev);
if (info->cmtd) {
- mtd_device_unregister(info->cmtd);
+ err = mtd_device_unregister(info->cmtd);
+ if (err)
+ return err;
+
if (info->cmtd != info->mtds[0])
mtd_concat_destroy(info->cmtd);
}
@@ -194,8 +197,12 @@ static int physmap_flash_probe(struct platform_device *dev)
part_types = physmap_data->part_probe_types ? : part_probe_types;
- mtd_device_parse_register(info->cmtd, part_types, NULL,
- physmap_data->parts, physmap_data->nr_parts);
+ err = mtd_device_parse_register(info->cmtd, part_types, NULL,
+ physmap_data->parts,
+ physmap_data->nr_parts);
+ if (err)
+ goto err_out;
+
return 0;
err_out:
--
2.14.1
next prev parent reply other threads:[~2018-10-19 7:50 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-19 7:48 [PATCH v2 00/15] mtd: maps: physmap cleanups Boris Brezillon
2018-10-19 7:48 ` [PATCH v2 01/15] mtd: maps: physmap: Add SPDX header Boris Brezillon
2018-10-19 7:48 ` [PATCH v2 02/15] mtd: maps: physmap: Rename ->map and ->mtd into ->maps and ->mtds Boris Brezillon
2018-10-19 7:48 ` [PATCH v2 03/15] mtd: maps: physmap: Use platform_get_resource() to retrieve iomem resources Boris Brezillon
2018-10-19 7:48 ` [PATCH v2 04/15] mtd: maps: physmap: Use dev_notice() and a %pR specifier Boris Brezillon
2018-10-19 7:48 ` [PATCH v2 05/15] mtd: maps: physmap: Use devm_ioremap_resource() Boris Brezillon
2018-10-19 7:48 ` [PATCH v2 06/15] mtd: maps: physmap: Remove the MAX_RESOURCES limitation Boris Brezillon
2018-10-19 7:49 ` Boris Brezillon [this message]
2018-10-19 7:49 ` [PATCH v2 08/15] mtd: maps: physmap: Return -ENOMEM directly when info allocation fails Boris Brezillon
2018-10-19 7:49 ` [PATCH v2 09/15] mtd: maps: physmap: Fix coding style issues reported by checkpatch Boris Brezillon
2018-10-19 7:49 ` [PATCH v2 10/15] mtd: maps: Prepare merging of physmap and physmap_of Boris Brezillon
2018-10-19 7:49 ` [PATCH v2 11/15] mtd: maps: Merge physmap_of.c into physmap-core.c Boris Brezillon
2019-04-02 23:44 ` [v2,11/15] " Chris Packham
2019-04-03 2:02 ` [PATCH] mtd: maps: Allow MTD_PHYSMAP with MTD_RAM Chris Packham
2019-05-01 18:02 ` [v2,11/15] mtd: maps: Merge physmap_of.c into physmap-core.c Li Yang
2018-10-19 7:49 ` [PATCH v2 12/15] mtd: maps: Rename physmap_of_{versatile, gemini} into physmap-{versatile, gemini} Boris Brezillon
2018-10-19 7:49 ` [PATCH v2 13/15] dt-binding: mtd: physmap: Document the addr-gpios property Boris Brezillon
2018-10-24 18:38 ` Rob Herring
2018-10-31 10:49 ` Linus Walleij
2018-10-19 7:49 ` [PATCH v2 14/15] mtd: maps: Merge gpio-addr-flash.c into physmap-core.c Boris Brezillon
2018-10-19 7:49 ` [PATCH v2 15/15] mtd: maps: physmap: Invert logic on if/else branch Boris Brezillon
2018-10-22 11:45 ` [PATCH v2 00/15] mtd: maps: physmap cleanups Linus Walleij
2018-10-22 13:41 ` Boris Brezillon
2018-11-05 21:27 ` 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=20181019074908.13226-8-boris.brezillon@bootlin.com \
--to=boris.brezillon@bootlin.com \
--cc=computersforpeace@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=dwmw2@infradead.org \
--cc=galak@codeaurora.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=linus.walleij@linaro.org \
--cc=linux-mtd@lists.infradead.org \
--cc=marek.vasut@gmail.com \
--cc=mark.rutland@arm.com \
--cc=pawel.moll@arm.com \
--cc=ricardo.ribalda@gmail.com \
--cc=richard@nod.at \
--cc=robh+dt@kernel.org \
/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).