ACPICA: Obsolete the acpi_os_derive_pci_id OSL interface

This function is not OS-dependent and has been replaced by
acpi_hw_derive_pci_id, which is now in the ACPICA core code.  Local
implementations of acpi_os_derive_pci_id are no longer necessary and
are removed. ACPICA BZ 857.

http://www.acpica.org/bugzilla/show_bug.cgi?id=857

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 10 insertions, 4 deletions

diff --git a/drivers/acpi/acpica/evrgnini.c b/drivers/acpi/acpica/evrgnini.c
index f40d271bf56..0b47a6dc929 100644
--- a/drivers/acpi/acpica/evrgnini.c
+++ b/drivers/acpi/acpica/evrgnini.c
@@ -289,8 +289,8 @@ acpi_ev_pci_config_region_setup(acpi_handle handle,
         }
 
         /*
-         * Get the PCI device and function numbers from the _ADR object contained
-         * in the parent's scope.
+         * Get the PCI device and function numbers from the _ADR object
+         * contained in the parent's scope.
          */
         status = acpi_ut_evaluate_numeric_object(METHOD_NAME__ADR,
                                                  pci_device_node, &pci_value);
@@ -320,9 +320,15 @@ acpi_ev_pci_config_region_setup(acpi_handle handle,
                 pci_id->bus = ACPI_LOWORD(pci_value);
         }
 
-        /* Complete this device's pci_id */
+        /* Complete/update the PCI ID for this device */
 
-        acpi_os_derive_pci_id(pci_root_node, region_obj->region.node, &pci_id);
+        status =
+            acpi_hw_derive_pci_id(pci_id, pci_root_node,
+                                  region_obj->region.node);
+        if (ACPI_FAILURE(status)) {
+                ACPI_FREE(pci_id);
+                return_ACPI_STATUS(status);
+        }
 
         *region_context = pci_id;
         return_ACPI_STATUS(AE_OK);