Skip to contentSkip to conversation

slimbus: core: Fix mismatch in of_node_get/put

PATCH In review Saravana Kannan 2 participants 2 messages Mar 26, 2020 – Apr 17, 2020 Serial low-power inter-chip media bus (SLIMbus)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 slimbus: core: Fix mismatch in of_node_get/put

Also, remove some unnecessary NULL checks. The functions in question already do NULL checks.

---
 drivers/slimbus/core.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/slimbus/core.c +3 -5
index 44228a5b246d..ae1e248a8fb8 100644
@@ -162,11 +162,8 @@ static int slim_add_device(struct slim_controller *ctrl,
 	sbdev->ctrl = ctrl;
 	INIT_LIST_HEAD(&sbdev->stream_list);
 	spin_lock_init(&sbdev->stream_list_lock);
-
-	if (node) {
-		sbdev->dev.of_node = of_node_get(node);
-		sbdev->dev.fwnode = of_fwnode_handle(node);
-	}
+	sbdev->dev.of_node = of_node_get(node);
+	sbdev->dev.fwnode = of_fwnode_handle(node);
 
 	dev_set_name(&sbdev->dev, "%x:%x:%x:%x",
 				  sbdev->e_addr.manf_id,
@@ -285,6 +282,7 @@ EXPORT_SYMBOL_GPL(slim_register_controller);
 /* slim_remove_device: Remove the effect of slim_add_device() */
 static void slim_remove_device(struct slim_device *sbdev)
 {
+	of_node_put(sbdev->dev.of_node);
 	device_unregister(&sbdev->dev);
 }
 
Signature · 1 line
2.25.1.696.g5e7596f4ac-goog
#1 lore raw
Quoted 4 lines · Saravana Kannan

Also, remove some unnecessary NULL checks. The functions in question already do NULL checks.

Applied Thanks,
--srini

Quoted 31 lines
---
  drivers/slimbus/core.c | 8 +++-----
  1 file changed, 3 insertions(+), 5 deletions(-)
drivers/slimbus/core.c +3 -5
index 44228a5b246d..ae1e248a8fb8 100644
@@ -162,11 +162,8 @@ static int slim_add_device(struct slim_controller *ctrl,
  	sbdev->ctrl = ctrl;
  	INIT_LIST_HEAD(&sbdev->stream_list);
  	spin_lock_init(&sbdev->stream_list_lock);
-
-	if (node) {
-		sbdev->dev.of_node = of_node_get(node);
-		sbdev->dev.fwnode = of_fwnode_handle(node);
-	}
+	sbdev->dev.of_node = of_node_get(node);
+	sbdev->dev.fwnode = of_fwnode_handle(node);
 
  	dev_set_name(&sbdev->dev, "%x:%x:%x:%x",
  				  sbdev->e_addr.manf_id,
@@ -285,6 +282,7 @@ EXPORT_SYMBOL_GPL(slim_register_controller);
  /* slim_remove_device: Remove the effect of slim_add_device() */
  static void slim_remove_device(struct slim_device *sbdev)
  {
+	of_node_put(sbdev->dev.of_node);
  	device_unregister(&sbdev->dev);
  }