evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ACPI / bind: Move acpi_get_child() to drivers/ide/ide-acpi.c

Browse source 
Since drivers/ide/ide-acpi.c is the only remaining user of
acpi_get_child(), move that function into that file as a static
routine.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Rafael J. Wysocki 2013-11-29 16:27:53 +01:00
parent 24dee1fc99
commit bfecc2b3e3
3 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/acpi/glue.c
View file

@ -151,18 +151,6 @@ struct acpi_device *acpi_find_child_device(struct acpi_device *parent,
} }
EXPORT_SYMBOL_GPL(acpi_find_child_device); EXPORT_SYMBOL_GPL(acpi_find_child_device);
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, false);
return adev ? adev->handle : NULL;
}
EXPORT_SYMBOL_GPL(acpi_get_child);
static void acpi_physnode_link_name(char *buf, unsigned int node_id) static void acpi_physnode_link_name(char *buf, unsigned int node_id)
{ {
if (node_id > 0) if (node_id > 0)

11
drivers/ide/ide-acpi.c
View file

@ -97,6 +97,17 @@ bool ide_port_acpi(ide_hwif_t *hwif)
return ide_noacpi == 0 && hwif->acpidata; return ide_noacpi == 0 && hwif->acpidata;
} }
static 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, false);
return adev ? adev->handle : NULL;
}
/** /**
* ide_get_dev_handle - finds acpi_handle and PCI device.function * ide_get_dev_handle - finds acpi_handle and PCI device.function
* @dev: device to locate * @dev: device to locate

1
include/acpi/acpi_bus.h
View file

@ -434,7 +434,6 @@ struct acpi_pci_root {
struct acpi_device *acpi_find_child_device(struct acpi_device *parent, struct acpi_device *acpi_find_child_device(struct acpi_device *parent,
u64 address, bool check_children); u64 address, bool check_children);
acpi_handle acpi_get_child(acpi_handle handle, u64 addr);
int acpi_is_root_bridge(acpi_handle); int acpi_is_root_bridge(acpi_handle);
struct acpi_pci_root *acpi_pci_find_root(acpi_handle handle); struct acpi_pci_root *acpi_pci_find_root(acpi_handle handle);