Gitweb: http://git.kernel.org/linus/6a29172ba90e49c046245610caff9848307bfd6a
Commit: 6a29172ba90e49c046245610caff9848307bfd6a
Parent: fca6825ad7382ae9df8ecda9068ac13ee9e343f4
Author: Bjorn Helgaas <bjorn.helgaas@hp.com>
AuthorDate: Mon Sep 14 16:35:15 2009 -0600
Committer: Jesse Barnes <jbarnes@virtuousgeek.org>
CommitDate: Mon Sep 14 17:38:26 2009 -0700
PCI hotplug: clean up acpi_get_hp_params_from_firmware() interface
This patch makes acpi_get_hp_params_from_firmware() take a
pci_dev rather than a pci_bus and makes it return a standard
int errno rather than acpi_status.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Reviewed-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Acked-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
---
drivers/pci/hotplug/acpi_pcihp.c | 14 +++++++-------
drivers/pci/hotplug/acpiphp_glue.c | 7 +++----
drivers/pci/hotplug/pciehp.h | 4 +---
drivers/pci/hotplug/shpchp.h | 4 +---
include/linux/pci_hotplug.h | 2 +-
5 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/drivers/pci/hotplug/acpi_pcihp.c b/drivers/pci/hotplug/acpi_pcihp.c
index ec3c039..14d2d8a 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 ...