[PATCH] PCI Hotplug: add common acpi functions to core

shpchprm_acpi.c and pciehprm_acpi.c are nearly identical.  In addition,
there are functions in both these files that are also in acpiphp_glue.c.
This patch will remove duplicate functions from shpchp, pciehp, and
acpiphp and move this functionality to pci_hotplug, as it is not
hardware specific.  Get rid of shpchprm* and pciehprm* files since they
are no longer needed.  shpchprm_nonacpi.c and pciehprm_nonacpi.c are
identical, as well as shpchprm_legacy.c and can be replaced with a
macro.

This patch also changes acpiphp to use the common hpp code.

Signed-off-by:  Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 8 insertions, 2 deletions

diff --git a/drivers/pci/hotplug/shpchp_pci.c b/drivers/pci/hotplug/shpchp_pci.c
index 19e1a5e1e30b..257adc233996 100644
--- a/drivers/pci/hotplug/shpchp_pci.c
+++ b/drivers/pci/hotplug/shpchp_pci.c
@@ -38,7 +38,7 @@ static void program_fw_provided_values(struct pci_dev *dev)
 {
         u16 pci_cmd, pci_bctl;
         struct pci_dev *cdev;
-        struct hotplug_params hpp = {0x8, 0x40, 0, 0}; /* defaults */
+        struct hotplug_params hpp;
 
         /* Program hpp values for this device */
         if (!(dev->hdr_type == PCI_HEADER_TYPE_NORMAL ||
@@ -46,7 +46,13 @@ static void program_fw_provided_values(struct pci_dev *dev)
                         (dev->class >> 8) == PCI_CLASS_BRIDGE_PCI)))
                 return;
 
-        get_hp_params_from_firmware(dev, &hpp);
+        /* use default values if we can't get them from firmware */
+        if (get_hp_params_from_firmware(dev, &hpp)) {
+                hpp.cache_line_size = 8;
+                hpp.latency_timer = 0x40;
+                hpp.enable_serr = 0;
+                hpp.enable_perr = 0;
+        }
 
         pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE, hpp.cache_line_size);
         pci_write_config_byte(dev, PCI_LATENCY_TIMER, hpp.latency_timer);