| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192939495 |
- From 4a1a40233b4a9fc159a5c7a27dc34c5c7bc5be55 Mon Sep 17 00:00:00 2001
- From: Miquel Raynal <[email protected]>
- Date: Fri, 15 Dec 2023 11:15:28 +0000
- Subject: [PATCH] nvmem: Move of_nvmem_layout_get_container() in another header
- nvmem-consumer.h is included by consumer devices, extracting data from
- NVMEM devices whereas nvmem-provider.h is included by devices providing
- NVMEM content.
- The only users of of_nvmem_layout_get_container() outside of the core
- are layout drivers, so better move its prototype to nvmem-provider.h.
- While we do so, we also move the kdoc associated with the function to
- the header rather than the .c file.
- 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 | 8 --------
- include/linux/nvmem-consumer.h | 7 -------
- include/linux/nvmem-provider.h | 21 +++++++++++++++++++++
- 3 files changed, 21 insertions(+), 15 deletions(-)
- --- a/drivers/nvmem/core.c
- +++ b/drivers/nvmem/core.c
- @@ -847,14 +847,6 @@ static int nvmem_add_cells_from_layout(s
- }
-
- #if IS_ENABLED(CONFIG_OF)
- -/**
- - * of_nvmem_layout_get_container() - Get OF node to layout container.
- - *
- - * @nvmem: nvmem device.
- - *
- - * Return: a node pointer with refcount incremented or NULL if no
- - * container exists. Use of_node_put() on it when done.
- - */
- struct device_node *of_nvmem_layout_get_container(struct nvmem_device *nvmem)
- {
- return of_get_child_by_name(nvmem->dev.of_node, "nvmem-layout");
- --- a/include/linux/nvmem-consumer.h
- +++ b/include/linux/nvmem-consumer.h
- @@ -241,7 +241,6 @@ struct nvmem_cell *of_nvmem_cell_get(str
- const char *id);
- struct nvmem_device *of_nvmem_device_get(struct device_node *np,
- const char *name);
- -struct device_node *of_nvmem_layout_get_container(struct nvmem_device *nvmem);
- #else
- static inline struct nvmem_cell *of_nvmem_cell_get(struct device_node *np,
- const char *id)
- @@ -254,12 +253,6 @@ static inline struct nvmem_device *of_nv
- {
- return ERR_PTR(-EOPNOTSUPP);
- }
- -
- -static inline struct device_node *
- -of_nvmem_layout_get_container(struct nvmem_device *nvmem)
- -{
- - return NULL;
- -}
- #endif /* CONFIG_NVMEM && CONFIG_OF */
-
- #endif /* ifndef _LINUX_NVMEM_CONSUMER_H */
- --- a/include/linux/nvmem-provider.h
- +++ b/include/linux/nvmem-provider.h
- @@ -244,6 +244,27 @@ nvmem_layout_get_match_data(struct nvmem
-
- #endif /* CONFIG_NVMEM */
-
- +#if IS_ENABLED(CONFIG_NVMEM) && IS_ENABLED(CONFIG_OF)
- +
- +/**
- + * of_nvmem_layout_get_container() - Get OF node of layout container
- + *
- + * @nvmem: nvmem device
- + *
- + * Return: a node pointer with refcount incremented or NULL if no
- + * container exists. Use of_node_put() on it when done.
- + */
- +struct device_node *of_nvmem_layout_get_container(struct nvmem_device *nvmem);
- +
- +#else /* CONFIG_NVMEM && CONFIG_OF */
- +
- +static inline struct device_node *of_nvmem_layout_get_container(struct nvmem_device *nvmem)
- +{
- + return NULL;
- +}
- +
- +#endif /* CONFIG_NVMEM && CONFIG_OF */
- +
- #define module_nvmem_layout_driver(__layout_driver) \
- module_driver(__layout_driver, nvmem_layout_register, \
- nvmem_layout_unregister)
|
