aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/acpi/glue.c6
-rw-r--r--include/acpi/acpi_bus.h6
2 files changed, 4 insertions, 8 deletions
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 9d200d5029ca..12b2acbaa116 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -150,17 +150,17 @@ struct acpi_device *acpi_find_child_device(struct acpi_device *parent,
150 return ret; 150 return ret;
151} 151}
152 152
153acpi_handle acpi_find_child(acpi_handle handle, u64 addr, bool is_bridge) 153acpi_handle acpi_get_child(acpi_handle handle, u64 addr)
154{ 154{
155 struct acpi_device *adev; 155 struct acpi_device *adev;
156 156
157 if (!handle || acpi_bus_get_device(handle, &adev)) 157 if (!handle || acpi_bus_get_device(handle, &adev))
158 return NULL; 158 return NULL;
159 159
160 adev = acpi_find_child_device(adev, addr, is_bridge); 160 adev = acpi_find_child_device(adev, addr, false);
161 return adev ? adev->handle : NULL; 161 return adev ? adev->handle : NULL;
162} 162}
163EXPORT_SYMBOL_GPL(acpi_find_child); 163EXPORT_SYMBOL_GPL(acpi_get_child);
164 164
165static void acpi_physnode_link_name(char *buf, unsigned int node_id) 165static void acpi_physnode_link_name(char *buf, unsigned int node_id)
166{ 166{
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 6d82c5c14c0f..a1a48f27933a 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -434,11 +434,7 @@ struct acpi_pci_root {
434 434
435struct acpi_device *acpi_find_child_device(struct acpi_device *parent, 435struct acpi_device *acpi_find_child_device(struct acpi_device *parent,
436 u64 address, bool check_children); 436 u64 address, bool check_children);
437acpi_handle acpi_find_child(acpi_handle, u64, bool); 437acpi_handle acpi_get_child(acpi_handle handle, u64 addr);
438static inline acpi_handle acpi_get_child(acpi_handle handle, u64 addr)
439{
440 return acpi_find_child(handle, addr, false);
441}
442void acpi_preset_companion(struct device *dev, acpi_handle parent, u64 addr); 438void acpi_preset_companion(struct device *dev, acpi_handle parent, u64 addr);
443int acpi_is_root_bridge(acpi_handle); 439int acpi_is_root_bridge(acpi_handle);
444struct acpi_pci_root *acpi_pci_find_root(acpi_handle handle); 440struct acpi_pci_root *acpi_pci_find_root(acpi_handle handle);