aboutsummaryrefslogtreecommitdiff
path: root/drivers/pci/hotplug/acpiphp_glue.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2009-09-14 16:35:15 -0600
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-09-14 17:38:26 -0700
commit6a29172ba90e49c046245610caff9848307bfd6a (patch)
tree41911e0b90cb6bec026f9eb2d4cc5e0f914afa75 /drivers/pci/hotplug/acpiphp_glue.c
parentfca6825ad7382ae9df8ecda9068ac13ee9e343f4 (diff)
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>
Diffstat (limited to 'drivers/pci/hotplug/acpiphp_glue.c')
-rw-r--r--drivers/pci/hotplug/acpiphp_glue.c7
1 files changed, 3 insertions, 4 deletions
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",