7 files changed, 13 insertions, 13 deletions

diff --git a/sound/core/seq/seq_instr.c b/sound/core/seq/seq_instr.c
index f30d171b6d96..5efe6523a589 100644
--- a/sound/core/seq/seq_instr.c
+++ b/sound/core/seq/seq_instr.c
@@ -109,7 +109,7 @@ void snd_seq_instr_list_free(struct snd_seq_kinstr_list **list_ptr)
                         spin_lock_irqsave(&list->lock, flags);
                         while (instr->use) {
                                 spin_unlock_irqrestore(&list->lock, flags);
-                                schedule_timeout_interruptible(1);
+                                schedule_timeout(1);
                                 spin_lock_irqsave(&list->lock, flags);
                         }                               
                         spin_unlock_irqrestore(&list->lock, flags);
@@ -199,7 +199,7 @@ int snd_seq_instr_list_free_cond(struct snd_seq_kinstr_list *list,
                         instr = flist;
                         flist = instr->next;
                         while (instr->use)
-                                schedule_timeout_interruptible(1);
+                                schedule_timeout(1);
                         if (snd_seq_instr_free(instr, atomic)<0)
                                 snd_printk(KERN_WARNING "instrument free problem\n");
                         instr = next;
@@ -555,7 +555,7 @@ static int instr_free(struct snd_seq_kinstr_ops *ops,
                                            SNDRV_SEQ_INSTR_NOTIFY_REMOVE);
                 while (instr->use) {
                         spin_unlock_irqrestore(&list->lock, flags);
-                        schedule_timeout_interruptible(1);
+                        schedule_timeout(1);
                         spin_lock_irqsave(&list->lock, flags);
                 }                               
                 spin_unlock_irqrestore(&list->lock, flags);
diff --git a/sound/isa/ad1848/ad1848_lib.c b/sound/isa/ad1848/ad1848_lib.c
index 8094282c2ae1..1bc2e3fd5721 100644
--- a/sound/isa/ad1848/ad1848_lib.c
+++ b/sound/isa/ad1848/ad1848_lib.c
@@ -245,7 +245,7 @@ static void snd_ad1848_mce_down(struct snd_ad1848 *chip)
                         snd_printk(KERN_ERR "mce_down - auto calibration time out (2)\n");
                         return;
                 }
-                time = schedule_timeout_interruptible(time);
+                time = schedule_timeout(time);
                 spin_lock_irqsave(&chip->reg_lock, flags);
         }
 #if 0
@@ -258,7 +258,7 @@ static void snd_ad1848_mce_down(struct snd_ad1848 *chip)
                         snd_printk(KERN_ERR "mce_down - auto calibration time out (3)\n");
                         return;
                 }
-                time = schedule_timeout_interruptible(time);
+                time = schedule_timeout(time);
                 spin_lock_irqsave(&chip->reg_lock, flags);
         }
         spin_unlock_irqrestore(&chip->reg_lock, flags);
diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c
index 9ea417bcf3e5..cbad2a51cbaa 100644
--- a/sound/isa/sscape.c
+++ b/sound/isa/sscape.c
@@ -382,7 +382,7 @@ static int obp_startup_ack(struct soundscape *s, unsigned timeout)
                 unsigned long flags;
                 unsigned char x;
 
-                schedule_timeout_interruptible(1);
+                schedule_timeout(1);
 
                 spin_lock_irqsave(&s->lock, flags);
                 x = inb(HOST_DATA_IO(s->io_base));
@@ -409,7 +409,7 @@ static int host_startup_ack(struct soundscape *s, unsigned timeout)
                 unsigned long flags;
                 unsigned char x;
 
-                schedule_timeout_interruptible(1);
+                schedule_timeout(1);
 
                 spin_lock_irqsave(&s->lock, flags);
                 x = inb(HOST_DATA_IO(s->io_base));
diff --git a/sound/isa/wavefront/wavefront_synth.c b/sound/isa/wavefront/wavefront_synth.c
index 78020d832e04..bacc51c86587 100644
--- a/sound/isa/wavefront/wavefront_synth.c
+++ b/sound/isa/wavefront/wavefront_synth.c
@@ -1780,7 +1780,7 @@ wavefront_should_cause_interrupt (snd_wavefront_t *dev,
         outb (val,port);
         spin_unlock_irq(&dev->irq_lock);
         while (1) {
-                if ((timeout = schedule_timeout_interruptible(timeout)) == 0)
+                if ((timeout = schedule_timeout(timeout)) == 0)
                         return;
                 if (dev->irq_ok)
                         return;
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 74e5593a58e1..c78ff901a572 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -538,7 +538,7 @@ static unsigned int azx_rirb_get_response(struct hda_codec *codec)
                 }
                 if (! chip->rirb.cmds)
                         return chip->rirb.res; /* the last value */
-                schedule_timeout_interruptible(1);
+                schedule_timeout(1);
         } while (time_after_eq(timeout, jiffies));
 
         if (chip->msi) {
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c
index 50c9f92cfd1b..6ea09df0c73a 100644
--- a/sound/pci/via82xx.c
+++ b/sound/pci/via82xx.c
@@ -2098,7 +2098,7 @@ static int snd_via82xx_chip_init(struct via82xx *chip)
                 pci_read_config_byte(chip->pci, VIA_ACLINK_STAT, &pval);
                 if (pval & VIA_ACLINK_C00_READY) /* primary codec ready */
                         break;
-                schedule_timeout_uninterruptible(1);
+                schedule_timeout(1);
         } while (time_before(jiffies, end_time));
 
         if ((val = snd_via82xx_codec_xread(chip)) & VIA_REG_AC97_BUSY)
@@ -2117,7 +2117,7 @@ static int snd_via82xx_chip_init(struct via82xx *chip)
                         chip->ac97_secondary = 1;
                         goto __ac97_ok2;
                 }
-                schedule_timeout_interruptible(1);
+                schedule_timeout(1);
         } while (time_before(jiffies, end_time));
         /* This is ok, the most of motherboards have only one codec */
 
diff --git a/sound/pci/via82xx_modem.c b/sound/pci/via82xx_modem.c
index 8cbf8eba4ae9..72425e73abae 100644
--- a/sound/pci/via82xx_modem.c
+++ b/sound/pci/via82xx_modem.c
@@ -983,7 +983,7 @@ static int snd_via82xx_chip_init(struct via82xx_modem *chip)
                 pci_read_config_byte(chip->pci, VIA_ACLINK_STAT, &pval);
                 if (pval & VIA_ACLINK_C00_READY) /* primary codec ready */
                         break;
-                schedule_timeout_uninterruptible(1);
+                schedule_timeout(1);
         } while (time_before(jiffies, end_time));
 
         if ((val = snd_via82xx_codec_xread(chip)) & VIA_REG_AC97_BUSY)
@@ -1001,7 +1001,7 @@ static int snd_via82xx_chip_init(struct via82xx_modem *chip)
                         chip->ac97_secondary = 1;
                         goto __ac97_ok2;
                 }
-                schedule_timeout_interruptible(1);
+                schedule_timeout(1);
         } while (time_before(jiffies, end_time));
         /* This is ok, the most of motherboards have only one codec */