From: Rajesh Shah <rajesh.shah@intel.com>
Export an acpi interface to get PCI domain/bus/devfn information from the
corresponding namespace handle. Used by acpiphp code to transpate the device
handle of the hot-plugged root bridge to the corresponding pci location
information.
Signed-off-by: Rajesh Shah <rajesh.shah@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/drivers/acpi/pci_bind.c | 11 +++++------
25-akpm/include/acpi/acpi_drivers.h | 1 +
2 files changed, 6 insertions(+), 6 deletions(-)
diff -puN drivers/acpi/pci_bind.c~acpi-bridge-hotadd-export-the-interface-to-get-pci-id-for-an-acpi-handle drivers/acpi/pci_bind.c
--- 25/drivers/acpi/pci_bind.c~acpi-bridge-hotadd-export-the-interface-to-get-pci-id-for-an-acpi-handle 2005-03-18 15:39:03.000000000 -0800
+++ 25-akpm/drivers/acpi/pci_bind.c 2005-03-18 15:39:03.000000000 -0800
@@ -61,15 +61,14 @@ acpi_pci_data_handler (
/**
- * acpi_os_get_pci_id
+ * acpi_get_pci_id
* ------------------
* This function is used by the ACPI Interpreter (a.k.a. Core Subsystem)
* to resolve PCI information for ACPI-PCI devices defined in the namespace.
* This typically occurs when resolving PCI operation region information.
*/
-#ifdef ACPI_FUTURE_USAGE
acpi_status
-acpi_os_get_pci_id (
+acpi_get_pci_id (
acpi_handle handle,
struct acpi_pci_id *id)
{
@@ -78,7 +77,7 @@ acpi_os_get_pci_id (
struct acpi_device *device = NULL;
struct acpi_pci_data *data = NULL;
- ACPI_FUNCTION_TRACE("acpi_os_get_pci_id");
+ ACPI_FUNCTION_TRACE("acpi_get_pci_id");
if (!id)
return_ACPI_STATUS(AE_BAD_PARAMETER);
@@ -92,7 +91,7 @@ acpi_os_get_pci_id (
}
status = acpi_get_data(handle, acpi_pci_data_handler, (void**) &data);
- if (ACPI_FAILURE(status) || !data || !data->dev) {
+ if (ACPI_FAILURE(status) || !data) {
ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
"Invalid ACPI-PCI context for device %s\n",
acpi_device_bid(device)));
@@ -115,7 +114,7 @@ acpi_os_get_pci_id (
return_ACPI_STATUS(AE_OK);
}
-#endif /* ACPI_FUTURE_USAGE */
+EXPORT_SYMBOL(acpi_get_pci_id);
int
diff -puN include/acpi/acpi_drivers.h~acpi-bridge-hotadd-export-the-interface-to-get-pci-id-for-an-acpi-handle include/acpi/acpi_drivers.h
--- 25/include/acpi/acpi_drivers.h~acpi-bridge-hotadd-export-the-interface-to-get-pci-id-for-an-acpi-handle 2005-03-18 15:39:03.000000000 -0800
+++ 25-akpm/include/acpi/acpi_drivers.h 2005-03-18 15:39:03.000000000 -0800
@@ -68,6 +68,7 @@ void acpi_pci_irq_del_prt (int segment,
struct pci_bus;
+acpi_status acpi_get_pci_id (acpi_handle handle, struct acpi_pci_id *id);
int acpi_pci_bind (struct acpi_device *device);
int acpi_pci_unbind (struct acpi_device *device);
int acpi_pci_bind_root (struct acpi_device *device, struct acpi_pci_id *id, struct pci_bus *bus);
_