diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-01 22:29:33 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-01 22:29:33 -0500 |
commit | 215e871aaa3d94540121a3809d80d0c5e5686e4f (patch) | |
tree | 0ed6469c5ad04db8cfa0edb58c676d5155df20cd /drivers/pci/hotplug/pciehp.h | |
parent | b6cf160c4b788a31f6a4017a469b956ca77febf4 (diff) | |
parent | fd7d1ced29e5beb88c9068801da7a362606d8273 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6: (64 commits)
PCI: make pci_bus a struct device
PCI: fix codingstyle issues in include/linux/pci.h
PCI: fix codingstyle issues in drivers/pci/pci.h
PCI: PCIE ASPM support
PCI: Fix fakephp deadlock
PCI: modify SB700 SATA MSI quirk
PCI: Run ACPI _OSC method on root bridges only
PCI ACPI: AER driver should only register PCIe devices with _OSC
PCI ACPI: Added a function to register _OSC with only PCIe devices.
PCI: constify function pointer tables
PCI: Convert drivers/pci/proc.c to use unlocked_ioctl
pciehp: block new requests from the device before power off
pciehp: workaround against Bad DLLP during power off
pciehp: wait for 1000ms before LED operation after power off
PCI: Remove pci_enable_device_bars() from documentation
PCI: Remove pci_enable_device_bars()
PCI: Remove users of pci_enable_device_bars()
PCI: Add pci_enable_device_{io,mem} intefaces
PCI: avoid save the same type of cap multiple times
PCI: correctly initialize a structure for pcie_save_pcix_state()
...
Diffstat (limited to 'drivers/pci/hotplug/pciehp.h')
-rw-r--r-- | drivers/pci/hotplug/pciehp.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h index 7959c222dc24..ca656b27a500 100644 --- a/drivers/pci/hotplug/pciehp.h +++ b/drivers/pci/hotplug/pciehp.h | |||
@@ -82,24 +82,18 @@ struct event_info { | |||
82 | }; | 82 | }; |
83 | 83 | ||
84 | struct controller { | 84 | struct controller { |
85 | struct controller *next; | ||
86 | struct mutex crit_sect; /* critical section mutex */ | 85 | struct mutex crit_sect; /* critical section mutex */ |
87 | struct mutex ctrl_lock; /* controller lock */ | 86 | struct mutex ctrl_lock; /* controller lock */ |
88 | int num_slots; /* Number of slots on ctlr */ | 87 | int num_slots; /* Number of slots on ctlr */ |
89 | int slot_num_inc; /* 1 or -1 */ | 88 | int slot_num_inc; /* 1 or -1 */ |
90 | struct pci_dev *pci_dev; | 89 | struct pci_dev *pci_dev; |
91 | struct list_head slot_list; | 90 | struct list_head slot_list; |
92 | struct slot *slot; | ||
93 | struct hpc_ops *hpc_ops; | 91 | struct hpc_ops *hpc_ops; |
94 | wait_queue_head_t queue; /* sleep & wake process */ | 92 | wait_queue_head_t queue; /* sleep & wake process */ |
95 | u8 bus; | ||
96 | u8 device; | ||
97 | u8 function; | ||
98 | u8 slot_device_offset; | 93 | u8 slot_device_offset; |
99 | u32 first_slot; /* First physical slot number */ /* PCIE only has 1 slot */ | 94 | u32 first_slot; /* First physical slot number */ /* PCIE only has 1 slot */ |
100 | u8 slot_bus; /* Bus where the slots handled by this controller sit */ | 95 | u8 slot_bus; /* Bus where the slots handled by this controller sit */ |
101 | u8 ctrlcap; | 96 | u8 ctrlcap; |
102 | u16 vendor_id; | ||
103 | u8 cap_base; | 97 | u8 cap_base; |
104 | struct timer_list poll_timer; | 98 | struct timer_list poll_timer; |
105 | volatile int cmd_busy; | 99 | volatile int cmd_busy; |
@@ -161,6 +155,9 @@ extern int pciehp_configure_device(struct slot *p_slot); | |||
161 | extern int pciehp_unconfigure_device(struct slot *p_slot); | 155 | extern int pciehp_unconfigure_device(struct slot *p_slot); |
162 | extern void pciehp_queue_pushbutton_work(struct work_struct *work); | 156 | extern void pciehp_queue_pushbutton_work(struct work_struct *work); |
163 | int pcie_init(struct controller *ctrl, struct pcie_device *dev); | 157 | int pcie_init(struct controller *ctrl, struct pcie_device *dev); |
158 | int pciehp_enable_slot(struct slot *p_slot); | ||
159 | int pciehp_disable_slot(struct slot *p_slot); | ||
160 | int pcie_init_hardware_part2(struct controller *ctrl, struct pcie_device *dev); | ||
164 | 161 | ||
165 | static inline struct slot *pciehp_find_slot(struct controller *ctrl, u8 device) | 162 | static inline struct slot *pciehp_find_slot(struct controller *ctrl, u8 device) |
166 | { | 163 | { |