kevin/linux
1
Fork 0
Code

nvmem: drop nvmem_layout_get_match_data()

Browse Source 
Thanks for layouts refactoring we now have "struct device" associated
with layout. Also its OF pointer points directly to the "nvmem-layout"
DT node.

All it takes to get match data is a generic of_device_get_match_data().

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
Reviewed-by: Michael Walle <michael@walle.cc>
Link: https://lore.kernel.org/r/20231219120104.3422-2-zajec5@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Rafał Miłecki 2023-12-19 13:01:04 +01:00 committed by Greg Kroah-Hartman
parent 401df0d4f4
commit 43f60e3fb6
2 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/nvmem/core.c
View File

@ -876,19 +876,6 @@ void nvmem_layout_unregister(struct nvmem_layout *layout)
} }
EXPORT_SYMBOL_GPL(nvmem_layout_unregister); EXPORT_SYMBOL_GPL(nvmem_layout_unregister);
const void *nvmem_layout_get_match_data(struct nvmem_device *nvmem,
struct nvmem_layout *layout)
{
struct device_node __maybe_unused *layout_np;
const struct of_device_id *match;
layout_np = of_nvmem_layout_get_container(nvmem);
match = of_match_node(layout->dev.driver->of_match_table, layout_np);
return match ? match->data : NULL;
}
EXPORT_SYMBOL_GPL(nvmem_layout_get_match_data);
/** /**
* nvmem_register() - Register a nvmem device for given nvmem_config. * nvmem_register() - Register a nvmem device for given nvmem_config.
* Also creates a binary entry in /sys/bus/nvmem/devices/dev-name/nvmem * Also creates a binary entry in /sys/bus/nvmem/devices/dev-name/nvmem

10
include/linux/nvmem-provider.h
View File

@ -205,9 +205,6 @@ void nvmem_layout_driver_unregister(struct nvmem_layout_driver *drv);
module_driver(__nvmem_layout_driver, nvmem_layout_driver_register, \ module_driver(__nvmem_layout_driver, nvmem_layout_driver_register, \
nvmem_layout_driver_unregister) nvmem_layout_driver_unregister)
const void *nvmem_layout_get_match_data(struct nvmem_device *nvmem,
struct nvmem_layout *layout);
#else #else
static inline struct nvmem_device *nvmem_register(const struct nvmem_config *c) static inline struct nvmem_device *nvmem_register(const struct nvmem_config *c)
@ -238,13 +235,6 @@ static inline int nvmem_layout_register(struct nvmem_layout *layout)
static inline void nvmem_layout_unregister(struct nvmem_layout *layout) {} static inline void nvmem_layout_unregister(struct nvmem_layout *layout) {}
static inline const void *
nvmem_layout_get_match_data(struct nvmem_device *nvmem,
struct nvmem_layout *layout)
{
return NULL;
}
#endif /* CONFIG_NVMEM */ #endif /* CONFIG_NVMEM */
#if IS_ENABLED(CONFIG_NVMEM) && IS_ENABLED(CONFIG_OF) #if IS_ENABLED(CONFIG_NVMEM) && IS_ENABLED(CONFIG_OF)