Since we do support FIT image overlays and file/dir based overlays the
filename variable is not sufficient anylonger. Therefore rename the
local variables as well as the filter function to hook.
To not break any systems keep the old filename based name too but mark
them as deprecated.
Signed-off-by: Marco Felsch <m.fel...@pengutronix.de>
---
drivers/of/overlay.c | 39 +++++++++++++++++++++------------------
include/of.h | 3 ++-
2 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
index 822487908ede..6b76eafc966e 100644
--- a/drivers/of/overlay.c
+++ b/drivers/of/overlay.c
@@ -234,12 +234,12 @@ static struct of_overlay_filter
*of_overlay_find_filter(const char *name)
return NULL;
}
-static bool of_overlay_matches_filter(const char *filename, struct device_node
*ovl)
+static bool of_overlay_matches_filter(const char *pattern, struct device_node
*ovl)
{
struct of_overlay_filter *filter;
char *p, *path, *n;
bool apply = false;
- bool have_filename_filter = false;
+ bool have_pattern_filter = false;
bool have_content_filter = false;
p = path = strdup(of_overlay_filter);
@@ -256,14 +256,16 @@ static bool of_overlay_matches_filter(const char
*filename, struct device_node *
continue;
}
- if (filter->filter_filename)
- have_filename_filter = true;
+ if (filter->filter_pattern || filter->filter_filename)
+ have_pattern_filter = true;
if (filter->filter_content)
have_content_filter = true;
- if (filename) {
- if (filter->filter_filename &&
- filter->filter_filename(filter,
kbasename(filename)))
+ if (pattern) {
+ if ((filter->filter_pattern &&
+ filter->filter_pattern(filter,
kbasename(pattern))) ||
+ (filter->filter_filename &&
+ filter->filter_filename(filter,
kbasename(pattern))))
score++;
} else {
score++;
@@ -286,11 +288,11 @@ static bool of_overlay_matches_filter(const char
*filename, struct device_node *
free(path);
/* No filter found at all, no match */
- if (!have_filename_filter && !have_content_filter)
+ if (!have_pattern_filter && !have_content_filter)
return false;
- /* Want to match filename, but we do not have a filename_filter */
- if (filename && !have_filename_filter)
+ /* Want to match pattern, but we do not have a filename_filter */
+ if (pattern && !have_pattern_filter)
return true;
/* Want to match content, but we do not have a content_filter */
@@ -298,12 +300,12 @@ static bool of_overlay_matches_filter(const char
*filename, struct device_node *
return true;
if (apply)
- pr_debug("filename %s, overlay %p: match against filter %s\n",
- filename ?: "<NONE>",
+ pr_debug("pattern %s, overlay %p: match against filter %s\n",
+ pattern ?: "<NONE>",
ovl, filter->name);
else
- pr_debug("filename %s, overlay %p: no match\n",
- filename ?: "<NONE>", ovl);
+ pr_debug("pattern %s, overlay %p: no match\n",
+ pattern ?: "<NONE>", ovl);
return apply;
}
@@ -594,14 +596,15 @@ static int of_overlay_global_fixup(struct device_node
*root, void *data)
* @filter: The new filter
*
* Register a new overlay filter. A filter can either match on
- * the filename or on the content of an overlay, but not on both.
+ * a pattern or on the content of an overlay, but not on both.
* If that's desired two filters have to be registered.
*
* @return: 0 for success, negative error code otherwise
*/
int of_overlay_register_filter(struct of_overlay_filter *filter)
{
- if (filter->filter_filename && filter->filter_content)
+ if ((filter->filter_pattern || filter->filter_filename) &&
+ filter->filter_content)
return -EINVAL;
list_add_tail(&filter->list, &of_overlay_filters);
@@ -651,7 +654,7 @@ static bool of_overlay_filter_pattern(struct
of_overlay_filter *f,
static struct of_overlay_filter of_overlay_pattern_filter = {
.name = "pattern",
- .filter_filename = of_overlay_filter_pattern,
+ .filter_pattern = of_overlay_filter_pattern,
};
static bool of_overlay_filter_filename(struct of_overlay_filter *f,
@@ -663,7 +666,7 @@ static bool of_overlay_filter_filename(struct
of_overlay_filter *f,
static struct of_overlay_filter of_overlay_filepattern_filter = {
.name = "filepattern",
- .filter_filename = of_overlay_filter_filename,
+ .filter_pattern = of_overlay_filter_filename,
};
/**
diff --git a/include/of.h b/include/of.h
index f99cff5cf54a..34cb535e1924 100644
--- a/include/of.h
+++ b/include/of.h
@@ -1298,7 +1298,8 @@ static inline struct device_node
*of_find_root_node(struct device_node *node)
}
struct of_overlay_filter {
- bool (*filter_filename)(struct of_overlay_filter *, const char
*filename);
+ bool (*filter_filename)(struct of_overlay_filter *, const char
*filename); /* deprecated */
+ bool (*filter_pattern)(struct of_overlay_filter *, const char *pattern);
bool (*filter_content)(struct of_overlay_filter *, struct device_node
*);
char *name;
struct list_head list;
--
2.39.2
