aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2009-09-14 18:35:35 -0400
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-09-14 20:39:12 -0400
commite81995bb1c0077a312cb621abc406a36f65a986a (patch)
tree9a451882e0c1528b4fbd9781605e0850d7bcb693 /include
parent11876e52e9148bf923795d6fcf8abed7f3662aaa (diff)
PCI hotplug: acpiphp: use generic pci_configure_slot()
Use the generic pci_configure_slot() rather than the acpiphp-specific decode_hpp() and program_hpp(). Unlike the previous acpiphp-specific code, pci_configure_slot() programs PCIe settings when an _HPX method provides them, so acpiphp-managed PCIe devices can now be configured. 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 'include')
-rw-r--r--include/linux/pci_hotplug.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
index 1cdef8317377..652ba797696d 100644
--- a/include/linux/pci_hotplug.h
+++ b/include/linux/pci_hotplug.h
@@ -227,12 +227,10 @@ struct hotplug_params {
227#ifdef CONFIG_ACPI 227#ifdef CONFIG_ACPI
228#include <acpi/acpi.h> 228#include <acpi/acpi.h>
229#include <acpi/acpi_bus.h> 229#include <acpi/acpi_bus.h>
230int acpi_get_hp_params_from_firmware(struct pci_dev *dev, 230int pci_get_hp_params(struct pci_dev *dev, struct hotplug_params *hpp);
231 struct hotplug_params *hpp);
232int acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev, u32 flags); 231int acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev, u32 flags);
233int acpi_pci_check_ejectable(struct pci_bus *pbus, acpi_handle handle); 232int acpi_pci_check_ejectable(struct pci_bus *pbus, acpi_handle handle);
234int acpi_pci_detect_ejectable(acpi_handle handle); 233int acpi_pci_detect_ejectable(acpi_handle handle);
235#define pci_get_hp_params(dev, hpp) acpi_get_hp_params_from_firmware(dev, hpp)
236#else 234#else
237static inline int pci_get_hp_params(struct pci_dev *dev, 235static inline int pci_get_hp_params(struct pci_dev *dev,
238 struct hotplug_params *hpp) 236 struct hotplug_params *hpp)