| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879 |
- From 1b7c298a4ecbc28cc6ee94005734bff55eb83d22 Mon Sep 17 00:00:00 2001
- From: Miquel Raynal <[email protected]>
- Date: Fri, 15 Dec 2023 11:15:30 +0000
- Subject: [PATCH] nvmem: Simplify the ->add_cells() hook
- The layout entry is not used and will anyway be made useless by the new
- layout bus infrastructure coming next, so drop it. While at it, clarify
- the kdoc entry.
- Signed-off-by: Miquel Raynal <[email protected]>
- Signed-off-by: Srinivas Kandagatla <[email protected]>
- Link: https://lore.kernel.org/r/[email protected]
- Signed-off-by: Greg Kroah-Hartman <[email protected]>
- ---
- drivers/nvmem/core.c | 2 +-
- drivers/nvmem/layouts/onie-tlv.c | 3 +--
- drivers/nvmem/layouts/sl28vpd.c | 3 +--
- include/linux/nvmem-provider.h | 8 +++-----
- 4 files changed, 6 insertions(+), 10 deletions(-)
- --- a/drivers/nvmem/core.c
- +++ b/drivers/nvmem/core.c
- @@ -816,7 +816,7 @@ static int nvmem_add_cells_from_layout(s
- int ret;
-
- if (layout && layout->add_cells) {
- - ret = layout->add_cells(&nvmem->dev, nvmem, layout);
- + ret = layout->add_cells(&nvmem->dev, nvmem);
- if (ret)
- return ret;
- }
- --- a/drivers/nvmem/layouts/onie-tlv.c
- +++ b/drivers/nvmem/layouts/onie-tlv.c
- @@ -182,8 +182,7 @@ static bool onie_tlv_crc_is_valid(struct
- return true;
- }
-
- -static int onie_tlv_parse_table(struct device *dev, struct nvmem_device *nvmem,
- - struct nvmem_layout *layout)
- +static int onie_tlv_parse_table(struct device *dev, struct nvmem_device *nvmem)
- {
- struct onie_tlv_hdr hdr;
- size_t table_len, data_len, hdr_len;
- --- a/drivers/nvmem/layouts/sl28vpd.c
- +++ b/drivers/nvmem/layouts/sl28vpd.c
- @@ -80,8 +80,7 @@ static int sl28vpd_v1_check_crc(struct d
- return 0;
- }
-
- -static int sl28vpd_add_cells(struct device *dev, struct nvmem_device *nvmem,
- - struct nvmem_layout *layout)
- +static int sl28vpd_add_cells(struct device *dev, struct nvmem_device *nvmem)
- {
- const struct nvmem_cell_info *pinfo;
- struct nvmem_cell_info info = {0};
- --- a/include/linux/nvmem-provider.h
- +++ b/include/linux/nvmem-provider.h
- @@ -156,9 +156,8 @@ struct nvmem_cell_table {
- *
- * @name: Layout name.
- * @of_match_table: Open firmware match table.
- - * @add_cells: Will be called if a nvmem device is found which
- - * has this layout. The function will add layout
- - * specific cells with nvmem_add_one_cell().
- + * @add_cells: Called to populate the layout using
- + * nvmem_add_one_cell().
- * @fixup_cell_info: Will be called before a cell is added. Can be
- * used to modify the nvmem_cell_info.
- * @owner: Pointer to struct module.
- @@ -172,8 +171,7 @@ struct nvmem_cell_table {
- struct nvmem_layout {
- const char *name;
- const struct of_device_id *of_match_table;
- - int (*add_cells)(struct device *dev, struct nvmem_device *nvmem,
- - struct nvmem_layout *layout);
- + int (*add_cells)(struct device *dev, struct nvmem_device *nvmem);
- void (*fixup_cell_info)(struct nvmem_device *nvmem,
- struct nvmem_layout *layout,
- struct nvmem_cell_info *cell);
|
