upgrade to linux 2.6.10-1.12_FC2

[linux-2.6.git] / drivers / pci / hotplug / pciehp.h

diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
index 1f0b21c..c6ce70a 100644 (file)
--- a/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
@@ -31,6 +31,7 @@
 
 #include <linux/types.h>
 #include <linux/pci.h>
+#include <linux/delay.h>
 #include <asm/semaphore.h>
 #include <asm/io.h>            
 #include "pci_hotplug.h"
@@ -206,9 +207,6 @@ struct resource_lists {
 #define msg_button_cancel      "PCI slot #%d - action canceled due to button press.\n"
 #define msg_button_ignore      "PCI slot #%d - button press ignored.  (action in progress...)\n"
 
-/* sysfs function for the hotplug controller info */
-extern void pciehp_create_ctrl_files   (struct controller *ctrl);
-
 /* controller functions */
 extern int     pciehprm_find_available_resources       (struct controller *ctrl);
 extern int     pciehp_event_start_thread       (void);
@@ -275,14 +273,12 @@ static inline int wait_for_ctrl_irq(struct controller *ctrl)
 
        dbg("%s : start\n", __FUNCTION__);
        add_wait_queue(&ctrl->queue, &wait);
-       set_current_state(TASK_INTERRUPTIBLE);
-       if (!pciehp_poll_mode) {
+       if (!pciehp_poll_mode)
                /* Sleep for up to 1 second */
-               schedule_timeout(1*HZ);
-       } else
-               schedule_timeout(2.5*HZ);
+               msleep_interruptible(1000);
+       else
+               msleep_interruptible(2500);
        
-       set_current_state(TASK_RUNNING);
        remove_wait_queue(&ctrl->queue, &wait);
        if (signal_pending(current))
                retval =  -EINTR;