Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11dcc75d authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarAaron Lu <aaron.lu@intel.com>
Tested-by: Aaron Lu <aaron.lu@intel.com> # for ATA binding
parent 5ce79d20

drivers/acpi/glue.c

+3 −3
Original line number Diff line number Diff line
@@ -150,17 +150,17 @@ 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 *adev;



	if (!handle || acpi_bus_get_device(handle, &adev))

		return NULL;



	adev = acpi_find_child_device(adev, addr, is_bridge);

	adev = acpi_find_child_device(adev, addr, false);

	return adev ? adev->handle : NULL;

}

EXPORT_SYMBOL_GPL(acpi_find_child);

EXPORT_SYMBOL_GPL(acpi_get_child);



static void acpi_physnode_link_name(char *buf, unsigned int node_id)

{

include/acpi/acpi_bus.h

+1 −5
Original line number Diff line number Diff line
@@ -434,11 +434,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);