[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, 3 insertions, 14 deletions

diff --git a/drivers/pci/hotplug/Makefile b/drivers/pci/hotplug/Makefile
index 1c0ed377ed91..421cfffb1756 100644
--- a/drivers/pci/hotplug/Makefile
+++ b/drivers/pci/hotplug/Makefile
@@ -22,6 +22,9 @@ ifdef CONFIG_HOTPLUG_PCI_CPCI
 pci_hotplug-objs        +=      cpci_hotplug_core.o     \
                                 cpci_hotplug_pci.o
 endif
+ifdef CONFIG_ACPI
+pci_hotplug-objs        +=      acpi_pcihp.o
+endif
 
 cpqphp-objs             :=      cpqphp_core.o   \
                                 cpqphp_ctrl.o   \
@@ -51,23 +54,9 @@ pciehp-objs		:=	pciehp_core.o	\
                                 pciehp_ctrl.o   \
                                 pciehp_pci.o    \
                                 pciehp_hpc.o
-ifdef CONFIG_ACPI
-        pciehp-objs += pciehprm_acpi.o
-else
-        pciehp-objs += pciehprm_nonacpi.o
-endif
 
 shpchp-objs             :=      shpchp_core.o   \
                                 shpchp_ctrl.o   \
                                 shpchp_pci.o    \
                                 shpchp_sysfs.o  \
                                 shpchp_hpc.o
-ifdef CONFIG_ACPI
-        shpchp-objs += shpchprm_acpi.o
-else
-        ifdef CONFIG_HOTPLUG_PCI_SHPC_PHPRM_LEGACY
-                shpchp-objs += shpchprm_legacy.o
-        else
-                shpchp-objs += shpchprm_nonacpi.o
-        endif
-endif