diff options
author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2009-09-14 18:35:30 -0400 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-09-14 20:39:11 -0400 |
commit | 11876e52e9148bf923795d6fcf8abed7f3662aaa (patch) | |
tree | 26c92c1064261e0c47897c4d1d14e52eda6a2a62 /drivers/pci/hotplug/shpchp.h | |
parent | d569c74d78ffcde2f163256e4da934ec3bacff0e (diff) |
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>
Diffstat (limited to 'drivers/pci/hotplug/shpchp.h')
-rw-r--r-- | drivers/pci/hotplug/shpchp.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/pci/hotplug/shpchp.h b/drivers/pci/hotplug/shpchp.h index ad6a255cf0a5..bd588eb8e922 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) | |||
188 | 188 | ||
189 | #ifdef CONFIG_ACPI | 189 | #ifdef CONFIG_ACPI |
190 | #include <linux/pci-acpi.h> | 190 | #include <linux/pci-acpi.h> |
191 | static inline int get_hp_params_from_firmware(struct pci_dev *dev, | ||
192 | struct hotplug_params *hpp) | ||
193 | { | ||
194 | return acpi_get_hp_params_from_firmware(dev, hpp); | ||
195 | } | ||
196 | |||
197 | static inline int get_hp_hw_control_from_firmware(struct pci_dev *dev) | 191 | static inline int get_hp_hw_control_from_firmware(struct pci_dev *dev) |
198 | { | 192 | { |
199 | u32 flags = OSC_SHPC_NATIVE_HP_CONTROL; | 193 | u32 flags = OSC_SHPC_NATIVE_HP_CONTROL; |
200 | return acpi_get_hp_hw_control_from_firmware(dev, flags); | 194 | return acpi_get_hp_hw_control_from_firmware(dev, flags); |
201 | } | 195 | } |
202 | #else | 196 | #else |
203 | #define get_hp_params_from_firmware(dev, hpp) (-ENODEV) | ||
204 | #define get_hp_hw_control_from_firmware(dev) (0) | 197 | #define get_hp_hw_control_from_firmware(dev) (0) |
205 | #endif | 198 | #endif |
206 | 199 | ||