device property: Retrieve fwnode from of_node via accessor

andy-shev · rafaeljw · commit 3cd8015040d7 · 2021-05-10T16:56:49.000+02:00
OF provides a specific accessor to retrieve fwnode handle.
Use it instead of direct dereferencing.

Signed-off-by: Andy Shevchenko &lt;andy.shevchenko@gmail.com&gt;
Signed-off-by: Rafael J. Wysocki &lt;rafael.j.wysocki@intel.com&gt;
diff --git a/drivers/base/property.c b/drivers/base/property.c
@@ -21,7 +21,7 @@
 struct fwnode_handle *dev_fwnode(struct device *dev)
 {
 	return IS_ENABLED(CONFIG_OF) && dev->of_node ?
-		&dev->of_node->fwnode : dev->fwnode;
+		of_fwnode_handle(dev->of_node) : dev->fwnode;
 }
 EXPORT_SYMBOL_GPL(dev_fwnode);
 
@@ -763,7 +763,7 @@ struct fwnode_handle *device_get_next_child_node(struct device *dev,
 	struct fwnode_handle *fwnode = NULL, *next;
 
 	if (dev->of_node)
-		fwnode = &dev->of_node->fwnode;
+		fwnode = of_fwnode_handle(dev->of_node);
 	else if (adev)
 		fwnode = acpi_fwnode_handle(adev);
 

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`struct fwnode_handle dev_fwnode(struct device dev)`
`22`	`22`	`{`
`23`	`23`	`return IS_ENABLED(CONFIG_OF) && dev->of_node ?`
`24`		`- &dev->of_node->fwnode : dev->fwnode;`
	`24`	`+ of_fwnode_handle(dev->of_node) : dev->fwnode;`
`25`	`25`	`}`
`26`	`26`	`EXPORT_SYMBOL_GPL(dev_fwnode);`
`27`	`27`
`@@ -763,7 +763,7 @@ struct fwnode_handle device_get_next_child_node(struct device dev,`
`763`	`763`	`struct fwnode_handle fwnode = NULL, next;`
`764`	`764`
`765`	`765`	`if (dev->of_node)`
`766`		`- fwnode = &dev->of_node->fwnode;`
	`766`	`+ fwnode = of_fwnode_handle(dev->of_node);`
`767`	`767`	`else if (adev)`
`768`	`768`	`fwnode = acpi_fwnode_handle(adev);`
`769`	`769`