diff options
| author | Kristen Accardi <kristen.c.accardi@intel.com> | 2006-03-03 10:16:05 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-03-23 14:35:17 -0800 |
| commit | 783c49fc506d9afe4784390b556fa25ede5d6d1f (patch) | |
| tree | 8090c2251193211129816254f16f10cbb33ed20c /drivers/pci/hotplug/pci_hotplug.h | |
| parent | f5afe8064f3087bead8fea7e32547c2a3ada5fd0 (diff) | |
| download | op-kernel-dev-783c49fc506d9afe4784390b556fa25ede5d6d1f.zip op-kernel-dev-783c49fc506d9afe4784390b556fa25ede5d6d1f.tar.gz | |
[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>
Diffstat (limited to 'drivers/pci/hotplug/pci_hotplug.h')
| -rw-r--r-- | drivers/pci/hotplug/pci_hotplug.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/drivers/pci/hotplug/pci_hotplug.h b/drivers/pci/hotplug/pci_hotplug.h index 88d44f7..e476ed0 100644 --- a/drivers/pci/hotplug/pci_hotplug.h +++ b/drivers/pci/hotplug/pci_hotplug.h @@ -176,5 +176,22 @@ extern int pci_hp_change_slot_info (struct hotplug_slot *slot, struct hotplug_slot_info *info); extern struct subsystem pci_hotplug_slots_subsys; +struct hotplug_params { + u8 cache_line_size; + u8 latency_timer; + u8 enable_serr; + u8 enable_perr; +}; + +#ifdef CONFIG_ACPI +#include <acpi/acpi.h> +#include <acpi/acpi_bus.h> +#include <acpi/actypes.h> +extern acpi_status acpi_run_oshp(acpi_handle handle); +extern acpi_status acpi_get_hp_params_from_firmware(struct pci_dev *dev, + struct hotplug_params *hpp); +extern u8 * acpi_path_name(acpi_handle handle); +int acpi_root_bridge(acpi_handle handle); +#endif #endif |
