]> err.no Git - linux-2.6/commit
[PATCH] PCI Hotplug: add common acpi functions to core
authorKristen Accardi <kristen.c.accardi@intel.com>
Fri, 3 Mar 2006 18:16:05 +0000 (10:16 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 23 Mar 2006 22:35:17 +0000 (14:35 -0800)
commit783c49fc506d9afe4784390b556fa25ede5d6d1f
tree8090c2251193211129816254f16f10cbb33ed20c
parentf5afe8064f3087bead8fea7e32547c2a3ada5fd0
[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>
14 files changed:
drivers/pci/hotplug/Makefile
drivers/pci/hotplug/acpi_pcihp.c [moved from drivers/pci/hotplug/pciehprm_acpi.c with 58% similarity]
drivers/pci/hotplug/acpiphp.h
drivers/pci/hotplug/acpiphp_glue.c
drivers/pci/hotplug/pci_hotplug.h
drivers/pci/hotplug/pciehp.h
drivers/pci/hotplug/pciehp_hpc.c
drivers/pci/hotplug/pciehprm_nonacpi.c [deleted file]
drivers/pci/hotplug/shpchp.h
drivers/pci/hotplug/shpchp_core.c
drivers/pci/hotplug/shpchp_pci.c
drivers/pci/hotplug/shpchprm_acpi.c [deleted file]
drivers/pci/hotplug/shpchprm_legacy.c [deleted file]
drivers/pci/hotplug/shpchprm_nonacpi.c [deleted file]