Gitweb: http://git.kernel.org/linus/11876e52e9148bf923795d6fcf8abed7f3662aaa
Commit: 11876e52e9148bf923795d6fcf8abed7f3662aaa
Parent: d569c74d78ffcde2f163256e4da934ec3bacff0e
Author: Bjorn Helgaas <bjorn.helgaas@hp.com>
AuthorDate: Mon Sep 14 16:35:30 2009 -0600
Committer: Jesse Barnes <jbarnes@virtuousgeek.org>
CommitDate: Mon Sep 14 17:39:11 2009 -0700
PCI hotplug: shpchp: use generic pci_configure_slot()
Use the generic pci_configure_slot() rather than the SHPC-specific
program_fw_provided_values().
Unlike the previous SHPC-specific code, pci_configure_slot() programs PCIe
settings when an _HPX method provides them, so if it's possible to have an
SHPC-managed PCIe device, it 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>
---
drivers/pci/hotplug/shpchp.h | 7 ----
drivers/pci/hotplug/shpchp_pci.c | 62 +-------------------------------------
2 files changed, 1 insertions(+), 68 deletions(-)
diff --git a/drivers/pci/hotplug/shpchp.h b/drivers/pci/hotplug/shpchp.h
index ad6a255..bd588eb 100644
--- a/drivers/pci/hotplug/shpchp.h
+++ b/drivers/pci/hotplug/shpchp.h
@@ -188,19 +188,12 @@ static inline const char *slot_name(struct slot *slot)
#ifdef CONFIG_ACPI
#include <linux/pci-acpi.h>
-static inline int get_hp_params_from_firmware(struct pci_dev *dev,
- struct hotplug_params *hpp)
-{
- return acpi_get_hp_params_from_firmware(dev, hpp);
-}
-
static inline int get_hp_hw_control_from_firmware(struct pci_dev *dev)
{
u32 flags = OSC_SHPC_NATIVE_HP_CONTROL;
return acpi_get_hp_hw_control_from_firmware(dev, flags);
}
#else
-#define get_hp_params_from_firmware(dev, hpp) (-ENODEV)
#define get_hp_hw_control_from_firmware(dev) (0)
#endif
diff --git ...
