aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/hotplug/pciehp.h
diff options
context:
space:
mode:
authorMark Lord <lkml@rtr.ca>2007-11-28 18:12:00 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2008-02-01 18:04:23 -0500
commitcd2fe83a81510acfd1ae29b8ffe04f7ef675c993 (patch)
treed445b9d21069284f782df86b097c687a4ff6d46c /drivers/pci/hotplug/pciehp.h
parent08e7a7d27d71e92305980033ec03c0a86b3efb2d (diff)
PCIE: Make use of the previously split out pcie_init_enable_events() function
Make use of the previously split out pcie_init_enable_events() function to reinitialize the hotplug hardware on resume from suspend, but only when pciehp_force==1. Otherwise behaviour is unmodified. Signed-off-by: Mark Lord <mlord@pobox.com> Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci/hotplug/pciehp.h')
-rw-r--r--drivers/pci/hotplug/pciehp.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
index 968f57087ce0..e4ad00a3448e 100644
--- a/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
@@ -162,6 +162,8 @@ extern int pciehp_unconfigure_device(struct slot *p_slot);
162extern void pciehp_queue_pushbutton_work(struct work_struct *work); 162extern void pciehp_queue_pushbutton_work(struct work_struct *work);
163int pcie_init(struct controller *ctrl, struct pcie_device *dev); 163int pcie_init(struct controller *ctrl, struct pcie_device *dev);
164int pciehp_enable_slot(struct slot *p_slot); 164int pciehp_enable_slot(struct slot *p_slot);
165int pciehp_disable_slot(struct slot *p_slot);
166int pcie_init_hardware(struct controller *ctrl, struct pcie_device *dev);
165 167
166static inline struct slot *pciehp_find_slot(struct controller *ctrl, u8 device) 168static inline struct slot *pciehp_find_slot(struct controller *ctrl, u8 device)
167{ 169{