summaryrefslogtreecommitdiffstats
path: root/include/linux/pci_hotplug.h
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2009-09-14 16:35:35 -0600
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-09-14 17:39:12 -0700
commite81995bb1c0077a312cb621abc406a36f65a986a (patch)
tree9a451882e0c1528b4fbd9781605e0850d7bcb693 /include/linux/pci_hotplug.h
parent11876e52e9148bf923795d6fcf8abed7f3662aaa (diff)
downloadop-kernel-dev-e81995bb1c0077a312cb621abc406a36f65a986a.zip
op-kernel-dev-e81995bb1c0077a312cb621abc406a36f65a986a.tar.gz
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/linux/pci_hotplug.h')
-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 1cdef83..652ba797 100644
--- a/include/linux/pci_hotplug.h
+++ b/include/linux/pci_hotplug.h
@@ -227,12 +227,10 @@ struct hotplug_params {
#ifdef CONFIG_ACPI
#include <acpi/acpi.h>
#include <acpi/acpi_bus.h>
-int acpi_get_hp_params_from_firmware(struct pci_dev *dev,
- struct hotplug_params *hpp);
+int pci_get_hp_params(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);
int acpi_pci_detect_ejectable(acpi_handle handle);
-#define pci_get_hp_params(dev, hpp) acpi_get_hp_params_from_firmware(dev, hpp)
#else
static inline int pci_get_hp_params(struct pci_dev *dev,
struct hotplug_params *hpp)
OpenPOWER on IntegriCloud