From: Michael Walle <michael@walle.cc>
To: Jonathan Corbet <corbet@lwn.net>,
Srinivas Kandagatla <srinivas.kandagatla@linaro.org>,
Miquel Raynal <miquel.raynal@bootlin.com>,
Rob Herring <robh+dt@kernel.org>,
Frank Rowand <frowand.list@gmail.com>,
Sascha Hauer <s.hauer@pengutronix.de>
Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
Michael Walle <michael@walle.cc>
Subject: [PATCH v4 09/20] nvmem: core: add nvmem_add_one_cell()
Date: Wed, 23 Nov 2022 19:01:40 +0100 [thread overview]
Message-ID: <20221123180151.2160033-10-michael@walle.cc> (raw)
In-Reply-To: <20221123180151.2160033-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>
---
changes since v3:
- none
changes since v2:
- add EXPORT_SYMBOL_GPL()
changes since v1:
- none
drivers/nvmem/core.c | 59 ++++++++++++++++++++--------------
include/linux/nvmem-provider.h | 8 +++++
2 files changed, 43 insertions(+), 24 deletions(-)
diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index 7c76e0e0072e..cb25bf29dea7 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -501,6 +501,36 @@ 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;
+}
+EXPORT_SYMBOL_GPL(nvmem_add_one_cell);
+
/**
* nvmem_add_cells() - Add cell information to an nvmem device
*
@@ -514,34 +544,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 14a32a1bc249..385d29168008 100644
--- a/include/linux/nvmem-provider.h
+++ b/include/linux/nvmem-provider.h
@@ -155,6 +155,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)
@@ -172,6 +175,11 @@ 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)
+{
+ return -EOPNOTSUPP;
+}
#endif /* CONFIG_NVMEM */
#endif /* ifndef _LINUX_NVMEM_PROVIDER_H */
--
2.30.2
next prev parent reply other threads:[~2022-11-23 18:04 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-23 18:01 [PATCH v4 00/20] nvmem: core: introduce NVMEM layouts Michael Walle
2022-11-23 18:01 ` [PATCH v4 01/20] net: add helper eth_addr_add() Michael Walle
2022-11-23 18:01 ` [PATCH v4 02/20] of: base: add of_parse_phandle_with_optional_args() Michael Walle
2022-11-23 18:01 ` [PATCH v4 03/20] of: property: make #.*-cells optional for simple props Michael Walle
2022-11-30 0:45 ` Rob Herring
2022-11-23 18:01 ` [PATCH v4 04/20] of: property: add #nvmem-cell-cells property Michael Walle
2022-11-30 0:45 ` Rob Herring
2022-11-23 18:01 ` [PATCH v4 05/20] nvmem: core: fix device node refcounting Michael Walle
2022-11-23 18:01 ` [PATCH v4 06/20] nvmem: core: add an index parameter to the cell Michael Walle
2022-11-23 18:01 ` [PATCH v4 07/20] nvmem: core: move struct nvmem_cell_info to nvmem-provider.h Michael Walle
2022-11-23 18:01 ` [PATCH v4 08/20] nvmem: core: drop the removal of the cells in nvmem_add_cells() Michael Walle
2022-11-23 18:01 ` Michael Walle [this message]
2022-11-23 18:01 ` [PATCH v4 10/20] nvmem: core: use nvmem_add_one_cell() in nvmem_add_cells_from_of() Michael Walle
2022-12-03 8:30 ` Dan Carpenter
2022-12-05 8:45 ` Michael Walle
2022-11-23 18:01 ` [PATCH v4 11/20] nvmem: core: introduce NVMEM layouts Michael Walle
2022-11-23 18:01 ` [PATCH v4 12/20] nvmem: core: add per-cell post processing Michael Walle
2022-11-23 18:01 ` [PATCH v4 13/20] nvmem: core: allow to modify a cell before adding it Michael Walle
2022-11-23 18:01 ` [PATCH v4 14/20] nvmem: imx-ocotp: replace global post processing with layouts Michael Walle
2022-11-23 18:01 ` [PATCH v4 15/20] nvmem: cell: drop global cell_post_process Michael Walle
2022-11-23 18:01 ` [PATCH v4 16/20] nvmem: core: provide own priv pointer in post process callback Michael Walle
2022-11-23 18:01 ` [PATCH v4 17/20] nvmem: layouts: add sl28vpd layout Michael Walle
2022-11-23 18:01 ` [PATCH v4 18/20] MAINTAINERS: add myself as sl28vpd nvmem layout driver Michael Walle
2022-11-23 18:01 ` [PATCH v4 19/20] nvmem: layouts: Add ONIE tlv " Michael Walle
2022-11-23 18:01 ` [PATCH v4 20/20] MAINTAINERS: Add myself as ONIE tlv NVMEM layout maintainer Michael Walle
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=20221123180151.2160033-10-michael@walle.cc \
--to=michael@walle.cc \
--cc=corbet@lwn.net \
--cc=devicetree@vger.kernel.org \
--cc=frowand.list@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=miquel.raynal@bootlin.com \
--cc=robh+dt@kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=srinivas.kandagatla@linaro.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).