diff options
author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2009-09-14 18:35:15 -0400 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-09-14 20:38:26 -0400 |
commit | 6a29172ba90e49c046245610caff9848307bfd6a (patch) | |
tree | 41911e0b90cb6bec026f9eb2d4cc5e0f914afa75 /drivers/pci/hotplug/acpiphp_glue.c | |
parent | fca6825ad7382ae9df8ecda9068ac13ee9e343f4 (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.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c index db81c08de8d5..14e6f1a17f28 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) | |||
275 | /* decode ACPI 2.0 _HPP hot plug parameters */ | 275 | /* decode ACPI 2.0 _HPP hot plug parameters */ |
276 | static void decode_hpp(struct pci_dev *dev, struct hotplug_params *hpp) | 276 | static void decode_hpp(struct pci_dev *dev, struct hotplug_params *hpp) |
277 | { | 277 | { |
278 | acpi_status status; | 278 | int ret; |
279 | 279 | ||
280 | status = acpi_get_hp_params_from_firmware(dev->bus, hpp); | 280 | ret = acpi_get_hp_params_from_firmware(dev, hpp); |
281 | if (ACPI_FAILURE(status) || | 281 | if (ret || !hpp->t0 || (hpp->t0->revision > 1)) { |
282 | !hpp->t0 || (hpp->t0->revision > 1)) { | ||
283 | /* use default numbers */ | 282 | /* use default numbers */ |
284 | printk(KERN_WARNING | 283 | printk(KERN_WARNING |
285 | "%s: Could not get hotplug parameters. Use defaults\n", | 284 | "%s: Could not get hotplug parameters. Use defaults\n", |