ACPI: property: Use acpi_dev_parent()

rafaeljw · rafaeljw · commit 98378956a407 · 2022-09-03T20:51:06.000+02:00
After introducing acpi_dev_parent() in commit 62fcb99 ("ACPI: Drop parent field from struct acpi_device"), it is better to use it instead of accessing the dev.parent field in struct acpi_device directly. Modify acpi_node_get_parent() accordingly. Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
diff --git a/drivers/acpi/property.c b/drivers/acpi/property.c
@@ -1270,10 +1270,11 @@ acpi_node_get_parent(const struct fwnode_handle *fwnode)
 		return to_acpi_data_node(fwnode)->parent;
 	}
 	if (is_acpi_device_node(fwnode)) {
-		struct device *dev = to_acpi_device_node(fwnode)->dev.parent;
+		struct acpi_device *parent;
 
-		if (dev)
-			return acpi_fwnode_handle(to_acpi_device(dev));
+		parent = acpi_dev_parent(to_acpi_device_node(fwnode));
+		if (parent)
+			return acpi_fwnode_handle(parent);
 	}
 
 	return NULL;

Original file line number	Diff line number	Diff line change
`@@ -1270,10 +1270,11 @@ acpi_node_get_parent(const struct fwnode_handle *fwnode)`
`1270`	`1270`	`return to_acpi_data_node(fwnode)->parent;`
`1271`	`1271`	`}`
`1272`	`1272`	`if (is_acpi_device_node(fwnode)) {`
`1273`		`- struct device *dev = to_acpi_device_node(fwnode)->dev.parent;`
	`1273`	`+ struct acpi_device *parent;`
`1274`	`1274`
`1275`		`- if (dev)`
`1276`		`- return acpi_fwnode_handle(to_acpi_device(dev));`
	`1275`	`+ parent = acpi_dev_parent(to_acpi_device_node(fwnode));`
	`1276`	`+ if (parent)`
	`1277`	`+ return acpi_fwnode_handle(parent);`
`1277`	`1278`	`}`
`1278`	`1279`
`1279`	`1280`	`return NULL;`