Skip to contentSkip to conversation

of: base: make of_device_compatible_match() accept const device node

PATCH Applied Dmitry Torokhov 2 participants 2 messages Sep 30, 2022 Device tree

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 of: base: make of_device_compatible_match() accept const device node

of_device_is_compatible() accepts const device node pointer, there is no reason why of_device_compatible_match() can't do the same.

---
 drivers/of/base.c  | 2 +-
 include/linux/of.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/of/base.c +1 -1
index 8e96862d312e..b7be15e85952 100644
@@ -561,7 +561,7 @@ EXPORT_SYMBOL(of_device_is_compatible);
  *  a NULL terminated array of strings. Returns the best match
  *  score or 0.
  */
-int of_device_compatible_match(struct device_node *device,
+int of_device_compatible_match(const struct device_node *device,
 			       const char *const *compat)
 {
 	unsigned int tmp, score = 0;
include/linux/of.h +2 -2
index 766d002bddb9..6b79ef9a6541 100644
@@ -342,7 +342,7 @@ extern int of_property_read_string_helper(const struct device_node *np,
 					      const char **out_strs, size_t sz, int index);
 extern int of_device_is_compatible(const struct device_node *device,
 				   const char *);
-extern int of_device_compatible_match(struct device_node *device,
+extern int of_device_compatible_match(const struct device_node *device,
 				      const char *const *compat);
 extern bool of_device_is_available(const struct device_node *device);
 extern bool of_device_is_big_endian(const struct device_node *device);
@@ -562,7 +562,7 @@ static inline int of_device_is_compatible(const struct device_node *device,
 	return 0;
 }
 
-static inline  int of_device_compatible_match(struct device_node *device,
+static inline  int of_device_compatible_match(const struct device_node *device,
 					      const char *const *compat)
 {
 	return 0;
Signature · 5 lines
2.38.0.rc1.362.ged0d419d3c-goog


-- 
Dmitry
maintainer Applied
#1 lore raw
Quoted 9 lines · Dmitry Torokhov

of_device_is_compatible() accepts const device node pointer, there is no reason why of_device_compatible_match() can't do the same.

---
 drivers/of/base.c  | 2 +-
 include/linux/of.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Applied, thanks!