ACPI / bind: Redefine acpi_get_child()

Since acpi_get_child() is the only user of acpi_find_child() now,
drop the static inline definition of the former and redefine the
latter as new acpi_get_child().

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Aaron Lu <aaron.lu@intel.com>
Tested-by: Aaron Lu <aaron.lu@intel.com> # for ATA binding

diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 5e3ec6afad398de7d55f0fd716b480f0c65bd18c..2499ab2f98a369681e3c03fdb5813dcce813928d 100644 (file)
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -150,16 +150,16 @@ struct acpi_device *acpi_find_child_device(struct acpi_device *parent,
        return ret;
 }
 
-acpi_handle acpi_find_child(acpi_handle handle, u64 addr, bool is_bridge)
+acpi_handle acpi_get_child(acpi_handle handle, u64 addr)
 {
        struct acpi_device *parent;
 
        if (!handle || acpi_bus_get_device(handle, &parent))
                return NULL;
 
-       return acpi_find_child_device(parent, addr, is_bridge);
+       return acpi_find_child_device(parent, addr, false);
 }
-EXPORT_SYMBOL_GPL(acpi_find_child);
+EXPORT_SYMBOL_GPL(acpi_get_child);
 
 static void acpi_physnode_link_name(char *buf, unsigned int node_id)
 {

diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 49e6c919c125365c77693e6ef274ad688584810d..bf556c9d5dcfc76bed9d8b97db54efe37c7e5c42 100644 (file)
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -436,11 +436,7 @@ struct acpi_pci_root {
 
 struct acpi_device *acpi_find_child_device(struct acpi_device *parent,
                                           u64 address, bool check_children);
-acpi_handle acpi_find_child(acpi_handle, u64, bool);
-static inline acpi_handle acpi_get_child(acpi_handle handle, u64 addr)
-{
-       return acpi_find_child(handle, addr, false);
-}
+acpi_handle acpi_get_child(acpi_handle handle, u64 addr);
 void acpi_preset_companion(struct device *dev, acpi_handle parent, u64 addr);
 int acpi_is_root_bridge(acpi_handle);
 struct acpi_pci_root *acpi_pci_find_root(acpi_handle handle);