1 files changed, 26 insertions, 10 deletions

diff --git a/include/linux/of.h b/include/linux/of.h
index 50fcdb54087f..fa089a2789a0 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -148,18 +148,28 @@ extern raw_spinlock_t devtree_lock;
 #ifdef CONFIG_OF
 void of_core_init(void);
 
-static inline bool is_of_node(struct fwnode_handle *fwnode)
+static inline bool is_of_node(const struct fwnode_handle *fwnode)
 {
         return !IS_ERR_OR_NULL(fwnode) && fwnode->type == FWNODE_OF;
 }
 
-static inline struct device_node *to_of_node(struct fwnode_handle *fwnode)
-{
-        return is_of_node(fwnode) ?
-                container_of(fwnode, struct device_node, fwnode) : NULL;
-}
-
-#define of_fwnode_handle(node) (&(node)->fwnode)
+#define to_of_node(__fwnode)                                            \
+        ({                                                              \
+                typeof(__fwnode) __to_of_node_fwnode = (__fwnode);      \
+                                                                        \
+                is_of_node(__to_of_node_fwnode) ?                       \
+                        container_of(__to_of_node_fwnode,               \
+                                     struct device_node, fwnode) :      \
+                        NULL;                                           \
+        })
+
+#define of_fwnode_handle(node)                                          \
+        ({                                                              \
+                typeof(node) __of_fwnode_handle_node = (node);          \
+                                                                        \
+                __of_fwnode_handle_node ?                               \
+                        &__of_fwnode_handle_node->fwnode : NULL;        \
+        })
 
 static inline bool of_have_populated_dt(void)
 {
@@ -533,12 +543,12 @@ static inline void of_core_init(void)
 {
 }
 
-static inline bool is_of_node(struct fwnode_handle *fwnode)
+static inline bool is_of_node(const struct fwnode_handle *fwnode)
 {
         return false;
 }
 
-static inline struct device_node *to_of_node(struct fwnode_handle *fwnode)
+static inline struct device_node *to_of_node(const struct fwnode_handle *fwnode)
 {
         return NULL;
 }
@@ -627,6 +637,12 @@ 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,
+                                              const char *const *compat)
+{
+        return 0;
+}
+
 static inline bool of_device_is_available(const struct device_node *device)
 {
         return false;