From: Michael Walle <michael@walle.cc>
To: "Miquel Raynal" <miquel.raynal@bootlin.com>,
"Richard Weinberger" <richard@nod.at>,
"Vignesh Raghavendra" <vigneshr@ti.com>,
"Rob Herring" <robh+dt@kernel.org>,
"Krzysztof Kozlowski" <krzysztof.kozlowski+dt@linaro.org>,
"Srinivas Kandagatla" <srinivas.kandagatla@linaro.org>,
"Shawn Guo" <shawnguo@kernel.org>, "Li Yang" <leoyang.li@nxp.com>,
"Rafał Miłecki" <rafal@milecki.pl>,
"David S . Miller" <davem@davemloft.net>,
"Eric Dumazet" <edumazet@google.com>,
"Jakub Kicinski" <kuba@kernel.org>,
"Paolo Abeni" <pabeni@redhat.com>,
"Frank Rowand" <frowand.list@gmail.com>
Cc: linux-mtd@lists.infradead.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org,
Ahmad Fatoum <a.fatoum@pengutronix.de>,
Michael Walle <michael@walle.cc>
Subject: [PATCH v1 04/14] nvmem: core: drop the removal of the cells in nvmem_add_cells()
Date: Thu, 25 Aug 2022 23:44:13 +0200 [thread overview]
Message-ID: <20220825214423.903672-5-michael@walle.cc> (raw)
In-Reply-To: <20220825214423.903672-1-michael@walle.cc>
If nvmem_add_cells() fails, the whole nvmem_register() will fail
and the cells will then be removed anyway. This is a prepartion
to introduce a nvmem_add_one_cell() which can then be used by
nvmem_add_cells().
This is then the same to what nvmem_add_cells_from_table() and
nvmem_add_cells_from_of() do.
Signed-off-by: Michael Walle <michael@walle.cc>
---
drivers/nvmem/core.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index ab055e4fc409..be38e62fd190 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -515,7 +515,7 @@ static int nvmem_add_cells(struct nvmem_device *nvmem,
int ncells)
{
struct nvmem_cell_entry **cells;
- int i, rval;
+ int i, rval = 0;
cells = kcalloc(ncells, sizeof(*cells), GFP_KERNEL);
if (!cells)
@@ -525,28 +525,22 @@ static int nvmem_add_cells(struct nvmem_device *nvmem,
cells[i] = kzalloc(sizeof(**cells), GFP_KERNEL);
if (!cells[i]) {
rval = -ENOMEM;
- goto err;
+ goto out;
}
rval = nvmem_cell_info_to_nvmem_cell_entry(nvmem, &info[i], cells[i]);
if (rval) {
kfree(cells[i]);
- goto err;
+ goto out;
}
nvmem_cell_entry_add(cells[i]);
}
+out:
/* remove tmp array */
kfree(cells);
- return 0;
-err:
- while (i--)
- nvmem_cell_entry_drop(cells[i]);
-
- kfree(cells);
-
return rval;
}
--
2.30.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-08-25 21:46 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-25 21:44 [PATCH v1 00/14] nvmem: core: introduce NVMEM layouts Michael Walle
2022-08-25 21:44 ` [PATCH v1 01/14] net: add helper eth_addr_add() Michael Walle
2022-09-01 16:26 ` Michael Walle
2022-09-01 16:31 ` Andrew Lunn
2022-09-01 19:54 ` Jakub Kicinski
2022-08-25 21:44 ` [PATCH v1 02/14] of: base: add of_parse_phandle_with_optional_args() Michael Walle
2022-08-25 21:44 ` [PATCH v1 03/14] nvmem: core: add an index parameter to the cell Michael Walle
2022-08-25 21:44 ` Michael Walle [this message]
2022-08-25 21:44 ` [PATCH v1 05/14] nvmem: core: add nvmem_add_one_cell() Michael Walle
2022-08-25 21:44 ` [PATCH v1 06/14] nvmem: core: introduce NVMEM layouts Michael Walle
2022-08-26 8:16 ` Michael Walle
2022-08-28 14:06 ` Rafał Miłecki
2022-08-28 14:33 ` Michael Walle
2022-08-30 13:36 ` Srinivas Kandagatla
2022-08-30 14:24 ` Michael Walle
2022-08-30 14:43 ` Srinivas Kandagatla
2022-08-30 15:02 ` Michael Walle
2022-08-30 15:23 ` Srinivas Kandagatla
2022-08-25 21:44 ` [PATCH v1 07/14] nvmem: core: add per-cell post processing Michael Walle
2022-08-30 13:37 ` Srinivas Kandagatla
2022-08-30 14:20 ` Michael Walle
2022-08-25 21:44 ` [PATCH v1 08/14] dt-bindings: mtd: relax the nvmem compatible string Michael Walle
2022-08-31 7:37 ` Krzysztof Kozlowski
2022-08-31 7:48 ` Michael Walle
2022-08-31 7:55 ` Krzysztof Kozlowski
2022-08-31 21:48 ` Rob Herring
2022-08-31 22:30 ` Michael Walle
2022-09-02 14:46 ` Rob Herring
2022-08-25 21:44 ` [PATCH v1 09/14] dt-bindings: nvmem: add YAML schema for the sl28 vpd layout Michael Walle
2022-08-26 16:05 ` Rob Herring
2022-08-31 7:45 ` Krzysztof Kozlowski
2022-08-31 8:17 ` Michael Walle
2022-08-31 9:24 ` Krzysztof Kozlowski
2022-08-31 9:51 ` Michael Walle
2022-08-31 13:07 ` Krzysztof Kozlowski
2022-08-31 15:29 ` Michael Walle
2022-08-25 21:44 ` [PATCH v1 10/14] nvmem: layouts: add sl28vpd layout Michael Walle
2022-08-25 21:44 ` [PATCH v1 11/14] nvmem: core: export nvmem device size Michael Walle
2022-08-25 21:44 ` [RFC PATCH v1 12/14] nvmem: layouts: rewrite the u-boot-env driver as a NVMEM layout Michael Walle
2022-08-28 14:04 ` Rafał Miłecki
2022-08-28 14:42 ` Michael Walle
2022-08-25 21:44 ` [RFC PATCH v1 13/14] nvmem: layouts: u-boot-env: add device node Michael Walle
2022-08-28 13:55 ` Rafał Miłecki
2022-08-28 14:36 ` Michael Walle
2022-08-25 21:44 ` [PATCH v1 14/14] arm64: dts: ls1028a: sl28: get MAC addresses from VPD Michael Walle
2022-08-28 15:05 ` [PATCH v1 00/14] nvmem: core: introduce NVMEM layouts Rafał Miłecki
2022-08-29 8:22 ` Michael Walle
2022-08-30 13:37 ` Srinivas Kandagatla
2022-08-31 7:48 ` Krzysztof Kozlowski
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=20220825214423.903672-5-michael@walle.cc \
--to=michael@walle.cc \
--cc=a.fatoum@pengutronix.de \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=edumazet@google.com \
--cc=frowand.list@gmail.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=kuba@kernel.org \
--cc=leoyang.li@nxp.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=miquel.raynal@bootlin.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=rafal@milecki.pl \
--cc=richard@nod.at \
--cc=robh+dt@kernel.org \
--cc=shawnguo@kernel.org \
--cc=srinivas.kandagatla@linaro.org \
--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).