5 files changed, 13 insertions, 18 deletions

diff --git a/drivers/pci/hotplug/acpi_pcihp.c b/drivers/pci/hotplug/acpi_pcihp.c
index ec3c039b7eb..14d2d8a01f6 100644
--- a/drivers/pci/hotplug/acpi_pcihp.c
+++ b/drivers/pci/hotplug/acpi_pcihp.c
@@ -324,18 +324,18 @@ static acpi_status acpi_run_oshp(acpi_handle handle)
 
 /* acpi_get_hp_params_from_firmware
  *
- * @bus - the pci_bus of the bus on which the device is newly added
+ * @dev - the pci_dev for which we want parameters
  * @hpp - allocated by the caller
  */
-acpi_status acpi_get_hp_params_from_firmware(struct pci_bus *bus,
+int acpi_get_hp_params_from_firmware(struct pci_dev *dev,
                 struct hotplug_params *hpp)
 {
-        acpi_status status = AE_NOT_FOUND;
+        acpi_status status;
         acpi_handle handle, phandle;
         struct pci_bus *pbus;
 
         handle = NULL;
-        for (pbus = bus; pbus; pbus = pbus->parent) {
+        for (pbus = dev->bus; pbus; pbus = pbus->parent) {
                 handle = acpi_pci_get_bridge_handle(pbus);
                 if (handle)
                         break;
@@ -350,10 +350,10 @@ acpi_status acpi_get_hp_params_from_firmware(struct pci_bus *bus,
         while (handle) {
                 status = acpi_run_hpx(handle, hpp);
                 if (ACPI_SUCCESS(status))
-                        break;
+                        return 0;
                 status = acpi_run_hpp(handle, hpp);
                 if (ACPI_SUCCESS(status))
-                        break;
+                        return 0;
                 if (acpi_is_root_bridge(handle))
                         break;
                 status = acpi_get_parent(handle, &phandle);
@@ -361,7 +361,7 @@ acpi_status acpi_get_hp_params_from_firmware(struct pci_bus *bus,
                         break;
                 handle = phandle;
         }
-        return status;
+        return -ENODEV;
 }
 EXPORT_SYMBOL_GPL(acpi_get_hp_params_from_firmware);
 
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index db81c08de8d..14e6f1a17f2 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -275,11 +275,10 @@ static int detect_ejectable_slots(acpi_handle handle)
 /* decode ACPI 2.0 _HPP hot plug parameters */
 static void decode_hpp(struct pci_dev *dev, struct hotplug_params *hpp)
 {
-        acpi_status status;
+        int ret;
 
-        status = acpi_get_hp_params_from_firmware(dev->bus, hpp);
-        if (ACPI_FAILURE(status) ||
-            !hpp->t0 || (hpp->t0->revision > 1)) {
+        ret = acpi_get_hp_params_from_firmware(dev, hpp);
+        if (ret || !hpp->t0 || (hpp->t0->revision > 1)) {
                 /* use default numbers */
                 printk(KERN_WARNING
                        "%s: Could not get hotplug parameters. Use defaults\n",
diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
index e6cf096498b..86cdfd71ed2 100644
--- a/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
@@ -241,9 +241,7 @@ static inline int pciehp_get_hp_hw_control_from_firmware(struct pci_dev *dev)
 static inline int pciehp_get_hp_params_from_firmware(struct pci_dev *dev,
                         struct hotplug_params *hpp)
 {
-        if (ACPI_FAILURE(acpi_get_hp_params_from_firmware(dev->bus, hpp)))
-                return -ENODEV;
-        return 0;
+        return acpi_get_hp_params_from_firmware(dev, hpp);
 }
 #else
 #define pciehp_firmware_init()                          do {} while (0)
diff --git a/drivers/pci/hotplug/shpchp.h b/drivers/pci/hotplug/shpchp.h
index 974e924ca96..ad6a255cf0a 100644
--- a/drivers/pci/hotplug/shpchp.h
+++ b/drivers/pci/hotplug/shpchp.h
@@ -191,9 +191,7 @@ static inline const char *slot_name(struct slot *slot)
 static inline int get_hp_params_from_firmware(struct pci_dev *dev,
                                               struct hotplug_params *hpp)
 {
-        if (ACPI_FAILURE(acpi_get_hp_params_from_firmware(dev->bus, hpp)))
-                        return -ENODEV;
-        return 0;
+        return acpi_get_hp_params_from_firmware(dev, hpp);
 }
 
 static inline int get_hp_hw_control_from_firmware(struct pci_dev *dev)
diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
index f0c31ae3f84..0a7c2401d94 100644
--- a/include/linux/pci_hotplug.h
+++ b/include/linux/pci_hotplug.h
@@ -227,7 +227,7 @@ struct hotplug_params {
 #ifdef CONFIG_ACPI
 #include <acpi/acpi.h>
 #include <acpi/acpi_bus.h>
-extern acpi_status acpi_get_hp_params_from_firmware(struct pci_bus *bus,
+int acpi_get_hp_params_from_firmware(struct pci_dev *dev,
                                 struct hotplug_params *hpp);
 int acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev, u32 flags);
 int acpi_pci_check_ejectable(struct pci_bus *pbus, acpi_handle handle);