git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
pci
/
hotplug
/
shpchp.h
diff --git
a/drivers/pci/hotplug/shpchp.h
b/drivers/pci/hotplug/shpchp.h
index
89f1922
..
c68b22e
100644
(file)
--- a/
drivers/pci/hotplug/shpchp.h
+++ b/
drivers/pci/hotplug/shpchp.h
@@
-31,7
+31,6
@@
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/types.h>
#include <linux/pci.h>
-#include <linux/delay.h>
#include <asm/semaphore.h>
#include <asm/io.h>
#include "pci_hotplug.h"
#include <asm/semaphore.h>
#include <asm/io.h>
#include "pci_hotplug.h"
@@
-312,7
+311,7
@@
struct php_ctlr_state_s {
php_intr_callback_t presence_change_callback;
php_intr_callback_t power_fault_callback;
void *callback_instance_id;
php_intr_callback_t presence_change_callback;
php_intr_callback_t power_fault_callback;
void *callback_instance_id;
- void
__iomem *creg;
/* Ptr to controller register space */
+ void
*creg;
/* Ptr to controller register space */
};
/* Inline functions */
};
/* Inline functions */
@@
-382,14
+381,16
@@
static inline int wait_for_ctrl_irq (struct controller *ctrl)
dbg("%s : start\n",__FUNCTION__);
add_wait_queue(&ctrl->queue, &wait);
dbg("%s : start\n",__FUNCTION__);
add_wait_queue(&ctrl->queue, &wait);
+ set_current_state(TASK_INTERRUPTIBLE);
if (!shpchp_poll_mode) {
/* Sleep for up to 1 second */
if (!shpchp_poll_mode) {
/* Sleep for up to 1 second */
-
msleep_interruptible(1000
);
+
schedule_timeout(1*HZ
);
} else {
/* Sleep for up to 2 seconds */
} else {
/* Sleep for up to 2 seconds */
-
msleep_interruptible(2000
);
+
schedule_timeout(2*HZ
);
}
}
+ set_current_state(TASK_RUNNING);
remove_wait_queue(&ctrl->queue, &wait);
if (signal_pending(current))
retval = -EINTR;
remove_wait_queue(&ctrl->queue, &wait);
if (signal_pending(current))
retval = -EINTR;