Skip to content

Commit

Permalink
ACPI: kill acpi_get_physical_pci_device()
Browse files Browse the repository at this point in the history
acpi_get_pci_dev() is (hopefully) better, and all callers have been
converted, so let's get rid of this duplicated functionality.

Cc: Thomas Renninger <[email protected]>
Signed-off-by: Alex Chiang <[email protected]>
Acked-by: Bjorn Helgaas <[email protected]>
Signed-off-by: Len Brown <[email protected]>
  • Loading branch information
Alexander Chiang authored and lenb committed Jun 18, 2009
1 parent 1e4cffe commit 7fe2a6c
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 41 deletions.
40 changes: 0 additions & 40 deletions drivers/acpi/glue.c
Original file line number Diff line number Diff line change
Expand Up @@ -140,46 +140,6 @@ struct device *acpi_get_physical_device(acpi_handle handle)

EXPORT_SYMBOL(acpi_get_physical_device);

/* ToDo: When a PCI bridge is found, return the PCI device behind the bridge
* This should work in general, but did not on a Lenovo T61 for the
* graphics card. But this must be fixed when the PCI device is
* bound and the kernel device struct is attached to the acpi device
* Note: A success call will increase reference count by one
* Do call put_device(dev) on the returned device then
*/
struct device *acpi_get_physical_pci_device(acpi_handle handle)
{
struct device *dev;
long long device_id;
acpi_status status;

status =
acpi_evaluate_integer(handle, "_ADR", NULL, &device_id);

if (ACPI_FAILURE(status))
return NULL;

/* We need to attempt to determine whether the _ADR refers to a
PCI device or not. There's no terribly good way to do this,
so the best we can hope for is to assume that there'll never
be a device in the host bridge */
if (device_id >= 0x10000) {
/* It looks like a PCI device. Does it exist? */
dev = acpi_get_physical_device(handle);
} else {
/* It doesn't look like a PCI device. Does its parent
exist? */
acpi_handle phandle;
if (acpi_get_parent(handle, &phandle))
return NULL;
dev = acpi_get_physical_device(phandle);
}
if (!dev)
return NULL;
return dev;
}
EXPORT_SYMBOL(acpi_get_physical_pci_device);

static int acpi_bind_one(struct device *dev, acpi_handle handle)
{
struct acpi_device *acpi_dev;
Expand Down
1 change: 0 additions & 1 deletion include/acpi/acpi_bus.h
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,6 @@ struct acpi_bus_type {
int register_acpi_bus_type(struct acpi_bus_type *);
int unregister_acpi_bus_type(struct acpi_bus_type *);
struct device *acpi_get_physical_device(acpi_handle);
struct device *acpi_get_physical_pci_device(acpi_handle);

/* helper */
acpi_handle acpi_get_child(acpi_handle, acpi_integer);
Expand Down

0 comments on commit 7fe2a6c

Please sign in to comment.