[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, 19 insertions, 11 deletions

diff --git a/drivers/pci/hotplug/shpchp.h b/drivers/pci/hotplug/shpchp.h
index f10f1ba877af..5c70f43908c4 100644
--- a/drivers/pci/hotplug/shpchp.h
+++ b/drivers/pci/hotplug/shpchp.h
@@ -106,12 +106,6 @@ struct controller {
         volatile int cmd_busy;
 };
 
-struct hotplug_params {
-        u8      cache_line_size;
-        u8      latency_timer;
-        u8      enable_serr;
-        u8      enable_perr;
-};
 
 /* Define AMD SHPC ID  */
 #define PCI_DEVICE_ID_AMD_GOLAM_7450    0x7450 
@@ -193,15 +187,29 @@ extern u8	shpchp_handle_power_fault(u8 hp_slot, void *inst_id);
 extern int      shpchp_save_config(struct controller *ctrl, int busnumber, int num_ctlr_slots, int first_device_num);
 extern int      shpchp_configure_device(struct slot *p_slot);
 extern int      shpchp_unconfigure_device(struct slot *p_slot);
-extern void     get_hp_hw_control_from_firmware(struct pci_dev *dev);
-extern void     get_hp_params_from_firmware(struct pci_dev *dev,
-                struct hotplug_params *hpp);
-extern int      shpchprm_get_physical_slot_number(struct controller *ctrl,
-                u32 *sun, u8 busnum, u8 devnum);
 extern void     shpchp_remove_ctrl_files(struct controller *ctrl);
 extern void     cleanup_slots(struct controller *ctrl);
 extern void     queue_pushbutton_work(void *data);
 
+
+#ifdef CONFIG_ACPI
+static inline int get_hp_params_from_firmware(struct pci_dev *dev,
+                        struct hotplug_params *hpp)
+{
+        if (ACPI_FAILURE(acpi_get_hp_params_from_firmware(dev, hpp)))
+                        return -ENODEV;
+        return 0;
+}
+#define get_hp_hw_control_from_firmware(pdev) \
+        do { \
+                if (DEVICE_ACPI_HANDLE(&(pdev->dev))) \
+                        acpi_run_oshp(DEVICE_ACPI_HANDLE(&(pdev->dev))); \
+        } while (0)
+#else
+#define get_hp_params_from_firmware(dev, hpp) (-ENODEV)
+#define get_hp_hw_control_from_firmware(dev) do { } while (0)
+#endif
+
 struct ctrl_reg {
         volatile u32 base_offset;
         volatile u32 slot_avail1;