acpi_device: Have acpi_device_scope() use a separate buffer
Have the different acpi_device_ path functions use a different static buffer so they can be called interchangeably. Change-Id: I270a80f66880861d5847bd586a16a73f8f1e2511 Signed-off-by: Duncan Laurie <dlaurie@chromium.org> Reviewed-on: https://review.coreboot.org/15521 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
This commit is contained in:
		| @@ -121,10 +121,15 @@ const char *acpi_device_path(struct device *dev) | |||||||
| /* Return the path of the parent device as the ACPI Scope for this device */ | /* Return the path of the parent device as the ACPI Scope for this device */ | ||||||
| const char *acpi_device_scope(struct device *dev) | const char *acpi_device_scope(struct device *dev) | ||||||
| { | { | ||||||
|  | 	static char buf[DEVICE_PATH_MAX] = {}; | ||||||
|  |  | ||||||
| 	if (!dev || !dev->bus || !dev->bus->dev) | 	if (!dev || !dev->bus || !dev->bus->dev) | ||||||
| 		return NULL; | 		return NULL; | ||||||
|  |  | ||||||
| 	return acpi_device_path(dev->bus->dev); | 	if (acpi_device_path_fill(dev->bus->dev, buf, sizeof(buf), 0) <= 0) | ||||||
|  | 		return NULL; | ||||||
|  |  | ||||||
|  | 	return buf; | ||||||
| } | } | ||||||
|  |  | ||||||
| /* Concatentate the device path and provided name suffix */ | /* Concatentate the device path and provided name suffix */ | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user