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 05/14] nvmem: core: add nvmem_add_one_cell()
Date: Thu, 25 Aug 2022 23:44:14 +0200 [thread overview]
Message-ID: <20220825214423.903672-6-michael@walle.cc> (raw)
In-Reply-To: <20220825214423.903672-1-michael@walle.cc>
Add a new function to add exactly one cell. This will be used by the
nvmem layout drivers to add custom cells. In contrast to the
nvmem_add_cells(), this has the advantage that we don't have to assemble
a list of cells on runtime.
Signed-off-by: Michael Walle <michael@walle.cc>
---
drivers/nvmem/core.c | 58 ++++++++++++++++++++--------------
include/linux/nvmem-provider.h | 5 +++
2 files changed, 39 insertions(+), 24 deletions(-)
diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index be38e62fd190..3dfd149374a8 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -501,6 +501,35 @@ static int nvmem_cell_info_to_nvmem_cell_entry(struct nvmem_device *nvmem,
return 0;
}
+/**
+ * nvmem_add_one_cell() - Add one cell information to an nvmem device
+ *
+ * @nvmem: nvmem device to add cells to.
+ * @info: nvmem cell info to add to the device
+ *
+ * Return: 0 or negative error code on failure.
+ */
+int nvmem_add_one_cell(struct nvmem_device *nvmem,
+ const struct nvmem_cell_info *info)
+{
+ struct nvmem_cell_entry *cell;
+ int rval;
+
+ cell = kzalloc(sizeof(*cell), GFP_KERNEL);
+ if (!cell)
+ return -ENOMEM;
+
+ rval = nvmem_cell_info_to_nvmem_cell_entry(nvmem, info, cell);
+ if (rval) {
+ kfree(cell);
+ return rval;
+ }
+
+ nvmem_cell_entry_add(cell);
+
+ return 0;
+}
+
/**
* nvmem_add_cells() - Add cell information to an nvmem device
*
@@ -514,34 +543,15 @@ static int nvmem_add_cells(struct nvmem_device *nvmem,
const struct nvmem_cell_info *info,
int ncells)
{
- struct nvmem_cell_entry **cells;
- int i, rval = 0;
-
- cells = kcalloc(ncells, sizeof(*cells), GFP_KERNEL);
- if (!cells)
- return -ENOMEM;
+ int i, rval;
for (i = 0; i < ncells; i++) {
- cells[i] = kzalloc(sizeof(**cells), GFP_KERNEL);
- if (!cells[i]) {
- rval = -ENOMEM;
- goto out;
- }
-
- rval = nvmem_cell_info_to_nvmem_cell_entry(nvmem, &info[i], cells[i]);
- if (rval) {
- kfree(cells[i]);
- goto out;
- }
-
- nvmem_cell_entry_add(cells[i]);
+ rval = nvmem_add_one_cell(nvmem, &info[i]);
+ if (rval)
+ return rval;
}
-out:
- /* remove tmp array */
- kfree(cells);
-
- return rval;
+ return 0;
}
/**
diff --git a/include/linux/nvmem-provider.h b/include/linux/nvmem-provider.h
index 8f964b394292..e710404959e7 100644
--- a/include/linux/nvmem-provider.h
+++ b/include/linux/nvmem-provider.h
@@ -138,6 +138,9 @@ struct nvmem_device *devm_nvmem_register(struct device *dev,
void nvmem_add_cell_table(struct nvmem_cell_table *table);
void nvmem_del_cell_table(struct nvmem_cell_table *table);
+int nvmem_add_one_cell(struct nvmem_device *nvmem,
+ const struct nvmem_cell_info *info);
+
#else
static inline struct nvmem_device *nvmem_register(const struct nvmem_config *c)
@@ -155,6 +158,8 @@ devm_nvmem_register(struct device *dev, const struct nvmem_config *c)
static inline void nvmem_add_cell_table(struct nvmem_cell_table *table) {}
static inline void nvmem_del_cell_table(struct nvmem_cell_table *table) {}
+static inline int nvmem_add_one_cell(struct nvmem_device *nvmem,
+ const struct nvmem_cell_info *info) {}
#endif /* CONFIG_NVMEM */
#endif /* ifndef _LINUX_NVMEM_PROVIDER_H */
--
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:48 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 ` [PATCH v1 04/14] nvmem: core: drop the removal of the cells in nvmem_add_cells() Michael Walle
2022-08-25 21:44 ` Michael Walle [this message]
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-6-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).