aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/hotplug/pciehp_ctrl.c
diff options
context:
space:
mode:
authorMark Lord <lkml@rtr.ca>2007-11-28 15:12:00 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2008-02-01 15:04:23 -0800
commitcd2fe83a81510acfd1ae29b8ffe04f7ef675c993 (patch)
treed445b9d21069284f782df86b097c687a4ff6d46c /drivers/pci/hotplug/pciehp_ctrl.c
parent08e7a7d27d71e92305980033ec03c0a86b3efb2d (diff)
downloadkernel_samsung_smdk4412-cd2fe83a81510acfd1ae29b8ffe04f7ef675c993.zip
kernel_samsung_smdk4412-cd2fe83a81510acfd1ae29b8ffe04f7ef675c993.tar.gz
kernel_samsung_smdk4412-cd2fe83a81510acfd1ae29b8ffe04f7ef675c993.tar.bz2
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_ctrl.c')
-rw-r--r--drivers/pci/hotplug/pciehp_ctrl.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c
index 342cfc6..e5eb910 100644
--- a/drivers/pci/hotplug/pciehp_ctrl.c
+++ b/drivers/pci/hotplug/pciehp_ctrl.c
@@ -37,7 +37,6 @@
#include "pciehp.h"
static void interrupt_event_handler(struct work_struct *work);
-static int pciehp_disable_slot(struct slot *p_slot);
static int queue_interrupt_event(struct slot *p_slot, u32 event_type)
{