[PATCH] pipe: remove redundant fifo_poll abstraction

[linux-2.6] / kernel / irq / autoprobe.c

diff --git a/kernel/irq/autoprobe.c b/kernel/irq/autoprobe.c
index 98d62d8efeaf93192c00b40ffe7841e228f64ea5..3467097ca61ae476a74a7eb1519950acc9a8ebcf 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/delay.h>
 
 /*
  * 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 val, delay;
+       unsigned long val;
        irq_desc_t *desc;
        unsigned int i;
 
@@ -45,8 +46,7 @@ unsigned long probe_irq_on(void)
        }
 
        /* 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
@@ -68,8 +68,7 @@ unsigned long probe_irq_on(void)
        /*
         * 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