73 lines
2.5 KiB
Diff
73 lines
2.5 KiB
Diff
From 43f60e3fb62edc7bd8891de8779fb422f4ae23ae Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
|
Date: Tue, 19 Dec 2023 13:01:04 +0100
|
|
Subject: [PATCH] nvmem: drop nvmem_layout_get_match_data()
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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>
|
|
---
|
|
drivers/nvmem/core.c | 13 -------------
|
|
include/linux/nvmem-provider.h | 10 ----------
|
|
2 files changed, 23 deletions(-)
|
|
|
|
--- a/drivers/nvmem/core.c
|
|
+++ b/drivers/nvmem/core.c
|
|
@@ -877,19 +877,6 @@ void nvmem_layout_unregister(struct nvme
|
|
}
|
|
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.
|
|
* Also creates a binary entry in /sys/bus/nvmem/devices/dev-name/nvmem
|
|
--- a/include/linux/nvmem-provider.h
|
|
+++ b/include/linux/nvmem-provider.h
|
|
@@ -205,9 +205,6 @@ void nvmem_layout_driver_unregister(stru
|
|
module_driver(__nvmem_layout_driver, nvmem_layout_driver_register, \
|
|
nvmem_layout_driver_unregister)
|
|
|
|
-const void *nvmem_layout_get_match_data(struct nvmem_device *nvmem,
|
|
- struct nvmem_layout *layout);
|
|
-
|
|
#else
|
|
|
|
static inline struct nvmem_device *nvmem_register(const struct nvmem_config *c)
|
|
@@ -238,13 +235,6 @@ static inline int nvmem_layout_register(
|
|
|
|
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 */
|
|
|
|
#if IS_ENABLED(CONFIG_NVMEM) && IS_ENABLED(CONFIG_OF)
|