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>,
"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,
Ahmad Fatoum <a.fatoum@pengutronix.de>,
Philipp Zabel <p.zabel@pengutronix.de>,
Michael Walle <michael@walle.cc>
Subject: [PATCH v2 07/20] nvmem: core: use nvmem_add_one_cell() in nvmem_add_cells_from_of()
Date: Fri, 2 Sep 2022 00:18:44 +0200 [thread overview]
Message-ID: <20220901221857.2600340-8-michael@walle.cc> (raw)
In-Reply-To: <20220901221857.2600340-1-michael@walle.cc>
Convert nvmem_add_cells_from_of() to use the new nvmem_add_one_cell().
This will remove duplicate code and it will make it possible to add a
hook to a nvmem layout in between, which can change fields before the
cell is finally added.
Signed-off-by: Michael Walle <michael@walle.cc>
---
changes since v1:
- new patch
drivers/nvmem/core.c | 38 ++++++++++++++------------------------
1 file changed, 14 insertions(+), 24 deletions(-)
diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index 3dfd149374a8..c640d411ab15 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -687,15 +687,15 @@ static int nvmem_validate_keepouts(struct nvmem_device *nvmem)
static int nvmem_add_cells_from_of(struct nvmem_device *nvmem)
{
- struct device_node *parent, *child;
struct device *dev = &nvmem->dev;
struct nvmem_cell_entry *cell;
+ struct device_node *child;
const __be32 *addr;
- int len;
+ int len, ret;
- parent = dev->of_node;
+ for_each_child_of_node(dev->of_node, child) {
+ struct nvmem_cell_info info = {0};
- for_each_child_of_node(parent, child) {
addr = of_get_property(child, "reg", &len);
if (!addr)
continue;
@@ -711,34 +711,24 @@ static int nvmem_add_cells_from_of(struct nvmem_device *nvmem)
return -ENOMEM;
}
- cell->nvmem = nvmem;
- cell->offset = be32_to_cpup(addr++);
- cell->bytes = be32_to_cpup(addr);
- cell->name = kasprintf(GFP_KERNEL, "%pOFn", child);
+ info.offset = be32_to_cpup(addr++);
+ info.bytes = be32_to_cpup(addr);
+ info.name = kasprintf(GFP_KERNEL, "%pOFn", child);
addr = of_get_property(child, "bits", &len);
if (addr && len == (2 * sizeof(u32))) {
- cell->bit_offset = be32_to_cpup(addr++);
- cell->nbits = be32_to_cpup(addr);
+ info.bit_offset = be32_to_cpup(addr++);
+ info.nbits = be32_to_cpup(addr);
}
- if (cell->nbits)
- cell->bytes = DIV_ROUND_UP(
- cell->nbits + cell->bit_offset,
- BITS_PER_BYTE);
+ info.np = of_node_get(child);
- if (!IS_ALIGNED(cell->offset, nvmem->stride)) {
- dev_err(dev, "cell %s unaligned to nvmem stride %d\n",
- cell->name, nvmem->stride);
- /* Cells already added will be freed later. */
- kfree_const(cell->name);
- kfree(cell);
+ ret = nvmem_add_one_cell(nvmem, &info);
+ kfree(info.name);
+ if (ret) {
of_node_put(child);
- return -EINVAL;
+ return ret;
}
-
- cell->np = of_node_get(child);
- nvmem_cell_entry_add(cell);
}
return 0;
--
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-09-01 22:26 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-01 22:18 [PATCH v2 00/20] nvmem: core: introduce NVMEM layouts Michael Walle
2022-09-01 22:18 ` [PATCH v2 01/20] net: add helper eth_addr_add() Michael Walle
2022-09-01 23:22 ` Randy Dunlap
2022-09-02 7:27 ` Michael Walle
2022-09-01 22:18 ` [PATCH v2 02/20] of: base: add of_parse_phandle_with_optional_args() Michael Walle
2022-09-01 22:18 ` [PATCH v2 03/20] nvmem: core: add an index parameter to the cell Michael Walle
2022-09-09 8:12 ` Srinivas Kandagatla
2022-09-01 22:18 ` [PATCH v2 04/20] nvmem: core: move struct nvmem_cell_info to nvmem-provider.h Michael Walle
2022-09-01 22:18 ` [PATCH v2 05/20] nvmem: core: drop the removal of the cells in nvmem_add_cells() Michael Walle
2022-09-01 22:18 ` [PATCH v2 06/20] nvmem: core: add nvmem_add_one_cell() Michael Walle
2022-09-09 8:52 ` Srinivas Kandagatla
2022-09-01 22:18 ` Michael Walle [this message]
2022-09-01 22:18 ` [PATCH v2 08/20] nvmem: core: introduce NVMEM layouts Michael Walle
2022-09-01 22:18 ` [PATCH v2 09/20] nvmem: core: add per-cell post processing Michael Walle
2022-09-01 22:18 ` [PATCH v2 10/20] nvmem: core: allow to modify a cell before adding it Michael Walle
2022-09-01 22:18 ` [PATCH v2 11/20] nvmem: imx-ocotp: replace global post processing with layouts Michael Walle
2022-09-07 12:31 ` Michael Walle
2022-09-01 22:18 ` [PATCH v2 12/20] nvmem: cell: drop global cell_post_process Michael Walle
2022-09-01 22:18 ` [PATCH v2 13/20] nvmem: core: drop priv pointer in post process callback Michael Walle
2022-09-09 8:52 ` Srinivas Kandagatla
2022-09-09 8:58 ` Michael Walle
2022-09-09 9:08 ` Srinivas Kandagatla
2022-09-09 9:39 ` Michael Walle
2022-09-01 22:18 ` [PATCH v2 14/20] dt-bindings: mtd: relax the nvmem compatible string Michael Walle
2022-09-08 12:21 ` Krzysztof Kozlowski
2022-09-01 22:18 ` [PATCH v2 15/20] dt-bindings: nvmem: add YAML schema for the sl28 vpd layout Michael Walle
2022-09-08 12:22 ` Krzysztof Kozlowski
2022-09-12 19:20 ` Rob Herring
2022-09-13 14:21 ` Michael Walle
2022-09-22 9:22 ` Miquel Raynal
2022-09-01 22:18 ` [PATCH v2 16/20] nvmem: layouts: add sl28vpd layout Michael Walle
2022-09-01 22:18 ` [PATCH v2 17/20] nvmem: core: export nvmem device size Michael Walle
2022-09-01 22:18 ` [PATCH v2 18/20] arm64: dts: ls1028a: sl28: get MAC addresses from VPD Michael Walle
2022-09-01 22:18 ` [RFC PATCH v2 19/20] nvmem: layouts: rewrite the u-boot-env driver as a NVMEM layout Michael Walle
2022-09-21 10:37 ` Miquel Raynal
2022-09-01 22:18 ` [RFC PATCH v2 20/20] nvmem: layouts: u-boot-env: add device node Michael Walle
2022-09-21 9:58 ` [PATCH v2 00/20] nvmem: core: introduce NVMEM layouts Miquel Raynal
2022-09-22 21:22 ` Srinivas Kandagatla
2022-09-23 8:31 ` Miquel Raynal
2022-09-23 15:47 ` Miquel Raynal
2022-09-23 17:28 ` 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=20220901221857.2600340-8-michael@walle.cc \
--to=michael@walle.cc \
--cc=a.fatoum@pengutronix.de \
--cc=devicetree@vger.kernel.org \
--cc=frowand.list@gmail.com \
--cc=krzysztof.kozlowski+dt@linaro.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=p.zabel@pengutronix.de \
--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).