Merge branch 'for-linus' into next

Sync up to bring in wacom_w8001 changes to avoid merge conflicts later.

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/input/rmi4/rmi_bus.c b/drivers/input/rmi4/rmi_bus.c
index b368b0515c5a..253df96be427 100644
--- a/drivers/input/rmi4/rmi_bus.c
+++ b/drivers/input/rmi4/rmi_bus.c
@@ -157,11 +157,11 @@ static int rmi_function_match(struct device *dev, struct device_driver *drv)
 static void rmi_function_of_probe(struct rmi_function *fn)
 {
         char of_name[9];
+        struct device_node *node = fn->rmi_dev->xport->dev->of_node;
 
         snprintf(of_name, sizeof(of_name), "rmi4-f%02x",
                 fn->fd.function_number);
-        fn->dev.of_node = of_find_node_by_name(
-                                fn->rmi_dev->xport->dev->of_node, of_name);
+        fn->dev.of_node = of_get_child_by_name(node, of_name);
 }
 #else
 static inline void rmi_function_of_probe(struct rmi_function *fn)