aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/hotplug/acpiphp.h
diff options
context:
space:
mode:
authorKristen Accardi <kristen.c.accardi@intel.com>2006-03-03 13:16:05 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2006-03-23 17:35:17 -0500
commit783c49fc506d9afe4784390b556fa25ede5d6d1f (patch)
tree8090c2251193211129816254f16f10cbb33ed20c /drivers/pci/hotplug/acpiphp.h
parentf5afe8064f3087bead8fea7e32547c2a3ada5fd0 (diff)
[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/acpiphp.h')
-rw-r--r--drivers/pci/hotplug/acpiphp.h15
1 files changed, 1 insertions, 14 deletions
diff --git a/drivers/pci/hotplug/acpiphp.h b/drivers/pci/hotplug/acpiphp.h
index de9df80ffb50..467ac70a46ff 100644
--- a/drivers/pci/hotplug/acpiphp.h
+++ b/drivers/pci/hotplug/acpiphp.h
@@ -64,19 +64,6 @@ struct slot {
64 struct acpiphp_slot *acpi_slot; 64 struct acpiphp_slot *acpi_slot;
65}; 65};
66 66
67/**
68 * struct hpp_param - ACPI 2.0 _HPP Hot Plug Parameters
69 * @cache_line_size in DWORD
70 * @latency_timer in PCI clock
71 * @enable_SERR 0 or 1
72 * @enable_PERR 0 or 1
73 */
74struct hpp_param {
75 u8 cache_line_size;
76 u8 latency_timer;
77 u8 enable_SERR;
78 u8 enable_PERR;
79};
80 67
81 68
82/** 69/**
@@ -100,7 +87,7 @@ struct acpiphp_bridge {
100 struct pci_dev *pci_dev; 87 struct pci_dev *pci_dev;
101 88
102 /* ACPI 2.0 _HPP parameters */ 89 /* ACPI 2.0 _HPP parameters */
103 struct hpp_param hpp; 90 struct hotplug_params hpp;
104 91
105 spinlock_t res_lock; 92 spinlock_t res_lock;
106}; 93};