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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
kernel
/
irq
/
autoprobe.c
diff --git
a/kernel/irq/autoprobe.c
b/kernel/irq/autoprobe.c
index
98d62d8
..
3467097
100644
(file)
--- a/
kernel/irq/autoprobe.c
+++ b/
kernel/irq/autoprobe.c
@@
-9,6
+9,7
@@
#include <linux/irq.h>
#include <linux/module.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/module.h>
#include <linux/interrupt.h>
+#include <linux/delay.h>
/*
* Autodetection depends on the fact that any interrupt that
/*
* Autodetection depends on the fact that any interrupt that
@@
-26,7
+27,7
@@
static DECLARE_MUTEX(probe_sem);
*/
unsigned long probe_irq_on(void)
{
*/
unsigned long probe_irq_on(void)
{
- unsigned long val
, delay
;
+ unsigned long val;
irq_desc_t *desc;
unsigned int i;
irq_desc_t *desc;
unsigned int i;
@@
-45,8
+46,7
@@
unsigned long probe_irq_on(void)
}
/* Wait for longstanding interrupts to trigger. */
}
/* Wait for longstanding interrupts to trigger. */
- for (delay = jiffies + HZ/50; time_after(delay, jiffies); )
- /* about 20ms delay */ barrier();
+ msleep(20);
/*
* enable any unassigned irqs
/*
* enable any unassigned irqs
@@
-68,8
+68,7
@@
unsigned long probe_irq_on(void)
/*
* Wait for spurious interrupts to trigger
*/
/*
* Wait for spurious interrupts to trigger
*/
- for (delay = jiffies + HZ/10; time_after(delay, jiffies); )
- /* about 100ms delay */ barrier();
+ msleep(100);
/*
* Now filter out any obviously spurious interrupts
/*
* Now filter out any obviously spurious interrupts