28 files changed, 51 insertions, 112 deletions
diff --git a/sound/core/seq/seq_instr.c b/sound/core/seq/seq_instr.c
index 019d43a462d7..1d525b13ebb6 100644
--- a/sound/core/seq/seq_instr.c
+++ b/sound/core/seq/seq_instr.c
@@ -109,8 +109,7 @@ void snd_seq_instr_list_free(snd_seq_kinstr_list_t **list_ptr)
                        spin_lock_irqsave(&list->lock, flags);
                        while (instr->use) {
                                spin_unlock_irqrestore(&list->lock, flags);
-                                set_current_state(TASK_INTERRUPTIBLE);
+                                schedule_timeout_interruptible(1);
-                                schedule_timeout(1);
                                spin_lock_irqsave(&list->lock, flags);
                        }                               
                        spin_unlock_irqrestore(&list->lock, flags);
@@ -199,10 +198,8 @@ int snd_seq_instr_list_free_cond(snd_seq_kinstr_list_t *list,
                while (flist) {
                        instr = flist;
                        flist = instr->next;
-                        while (instr->use) {
+                        while (instr->use)
-                                set_current_state(TASK_INTERRUPTIBLE);
+                                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;
@@ -554,8 +551,7 @@ static int instr_free(snd_seq_kinstr_ops_t *ops,
                        instr->ops->notify(instr->ops->private_data, instr, SNDRV_SEQ_INSTR_NOTIFY_REMOVE);
                while (instr->use) {
                        spin_unlock_irqrestore(&list->lock, flags);
-                        set_current_state(TASK_INTERRUPTIBLE);
+                        schedule_timeout_interruptible(1);
-                        schedule_timeout(1);
                        spin_lock_irqsave(&list->lock, flags);
                }                               
                spin_unlock_irqrestore(&list->lock, flags);
diff --git a/sound/core/seq/seq_lock.c b/sound/core/seq/seq_lock.c
index b09cee058fa7..a837a94b2d2a 100644
--- a/sound/core/seq/seq_lock.c
+++ b/sound/core/seq/seq_lock.c
@@ -39,8 +39,7 @@ void snd_use_lock_sync_helper(snd_use_lock_t *lockp, const char *file, int line)
                        snd_printk(KERN_WARNING "seq_lock: timeout [%d left] in %s:%d\n", atomic_read(lockp), file, line);
                        break;
                }
-                set_current_state(TASK_UNINTERRUPTIBLE);
+                schedule_timeout_uninterruptible(1);
-                schedule_timeout(1);
                max_count--;
        }
 }
diff --git a/sound/core/seq/seq_memory.c b/sound/core/seq/seq_memory.c
index d4d7d326c4b1..8416bcffa091 100644
--- a/sound/core/seq/seq_memory.c
+++ b/sound/core/seq/seq_memory.c
@@ -423,8 +423,7 @@ int snd_seq_pool_done(pool_t *pool)
                        snd_printk(KERN_WARNING "snd_seq_pool_done timeout: %d cells remain\n", atomic_read(&pool->counter));
                        break;
                }
-                set_current_state(TASK_UNINTERRUPTIBLE);
+                schedule_timeout_uninterruptible(1);
-                schedule_timeout(1);
                max_count--;
        }
        
diff --git a/sound/i2c/cs8427.c b/sound/i2c/cs8427.c
index 21133eb6e881..1a05cfbdc7c6 100644
--- a/sound/i2c/cs8427.c
+++ b/sound/i2c/cs8427.c
@@ -302,8 +302,7 @@ static void snd_cs8427_reset(snd_i2c_device_t *cs8427)
                snd_i2c_unlock(cs8427->bus);
                if (!(data & CS8427_UNLOCK))
                        break;
-                set_current_state(TASK_UNINTERRUPTIBLE);
+                schedule_timeout_uninterruptible(1);
-                schedule_timeout(1);
        }
        snd_i2c_lock(cs8427->bus);
        chip->regmap[CS8427_REG_CLOCKSOURCE] &= ~CS8427_RXDMASK;
diff --git a/sound/isa/ad1848/ad1848_lib.c b/sound/isa/ad1848/ad1848_lib.c
index 744b65a35c9c..891bacc94f68 100644
--- a/sound/isa/ad1848/ad1848_lib.c
+++ b/sound/isa/ad1848/ad1848_lib.c
@@ -243,8 +243,7 @@ static void snd_ad1848_mce_down(ad1848_t *chip)
                        snd_printk(KERN_ERR "mce_down - auto calibration time out (2)\n");
                        return;
                }
-                set_current_state(TASK_INTERRUPTIBLE);
+                time = schedule_timeout_interruptible(time);
-                time = schedule_timeout(time);
                spin_lock_irqsave(&chip->reg_lock, flags);
        }
 #if 0
@@ -257,8 +256,7 @@ static void snd_ad1848_mce_down(ad1848_t *chip)
                        snd_printk(KERN_ERR "mce_down - auto calibration time out (3)\n");
                        return;
                }
-                set_current_state(TASK_INTERRUPTIBLE);
+                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/gus/gus_pcm.c b/sound/isa/gus/gus_pcm.c
index 720c0739c3a5..1cc89fb67bf2 100644
--- a/sound/isa/gus/gus_pcm.c
+++ b/sound/isa/gus/gus_pcm.c
@@ -333,8 +333,7 @@ static int snd_gf1_pcm_poke_block(snd_gus_card_t *gus, unsigned char *buf,
                        }
                }
                if (count > 0 && !in_interrupt()) {
-                        set_current_state(TASK_INTERRUPTIBLE);
+                        schedule_timeout_interruptible(1);
-                        schedule_timeout(1);
                        if (signal_pending(current))
                                return -EAGAIN;
                }
diff --git a/sound/isa/sb/emu8000.c b/sound/isa/sb/emu8000.c
index 95540f133199..b09c6575e01a 100644
--- a/sound/isa/sb/emu8000.c
+++ b/sound/isa/sb/emu8000.c
@@ -135,8 +135,7 @@ static void __init
 snd_emu8000_read_wait(emu8000_t *emu)
 {
        while ((EMU8000_SMALR_READ(emu) & 0x80000000) != 0) {
-                set_current_state(TASK_INTERRUPTIBLE);
+                schedule_timeout_interruptible(1);
-                schedule_timeout(1);
                if (signal_pending(current))
                        break;
        }
@@ -148,8 +147,7 @@ static void __init
 snd_emu8000_write_wait(emu8000_t *emu)
 {
        while ((EMU8000_SMALW_READ(emu) & 0x80000000) != 0) {
-                set_current_state(TASK_INTERRUPTIBLE);
+                schedule_timeout_interruptible(1);
-                schedule_timeout(1);
                if (signal_pending(current))
                        break;
        }
@@ -437,8 +435,7 @@ size_dram(emu8000_t *emu)
        for (i = 0; i < 10000; i++) {
                if ((EMU8000_SMALW_READ(emu) & 0x80000000) == 0)
                        break;
-                set_current_state(TASK_INTERRUPTIBLE);
+                schedule_timeout_interruptible(1);
-                schedule_timeout(1);
                if (signal_pending(current))
                        break;
        }
diff --git a/sound/isa/sb/emu8000_patch.c b/sound/isa/sb/emu8000_patch.c
index 26e693078cb3..2fea67e71c78 100644
--- a/sound/isa/sb/emu8000_patch.c
+++ b/sound/isa/sb/emu8000_patch.c
@@ -109,8 +109,7 @@ static void
 snd_emu8000_write_wait(emu8000_t *emu)
 {
        while ((EMU8000_SMALW_READ(emu) & 0x80000000) != 0) {
-                set_current_state(TASK_INTERRUPTIBLE);
+                schedule_timeout_interruptible(1);
-                schedule_timeout(1);
                if (signal_pending(current))
                        break;
        }
diff --git a/sound/isa/sb/emu8000_pcm.c b/sound/isa/sb/emu8000_pcm.c
index 0209790dc4b5..b323beeeda15 100644
--- a/sound/isa/sb/emu8000_pcm.c
+++ b/sound/isa/sb/emu8000_pcm.c
@@ -117,8 +117,7 @@ snd_emu8000_write_wait(emu8000_t *emu, int can_schedule)
 {
        while ((EMU8000_SMALW_READ(emu) & 0x80000000) != 0) {
                if (can_schedule) {
-                        set_current_state(TASK_INTERRUPTIBLE);
+                        schedule_timeout_interruptible(1);
-                        schedule_timeout(1);
                        if (signal_pending(current))
                                break;
                }
diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c
index 1036876146c4..11588067fa4f 100644
--- a/sound/isa/sscape.c
+++ b/sound/isa/sscape.c
@@ -343,19 +343,6 @@ static void soundscape_free(snd_card_t * c)
 }
 /*
- * Put this process into an idle wait-state for a certain number
- * of "jiffies". The process can almost certainly be rescheduled
- * while we're waiting, and so we must NOT be holding any spinlocks
- * when we call this function. If we are then we risk DEADLOCK in
- * SMP (Ha!) or pre-emptible kernels.
- */
-static inline void sleep(long jiffs, int state)
-{
-        set_current_state(state);
-        schedule_timeout(jiffs);
-}
-/*
 * Tell the SoundScape to begin a DMA tranfer using the given channel.
 * All locking issues are left to the caller.
 */
@@ -392,7 +379,7 @@ static int obp_startup_ack(struct soundscape *s, unsigned timeout)
                unsigned long flags;
                unsigned char x;
-                sleep(1, TASK_INTERRUPTIBLE);
+                schedule_timeout_interruptible(1);
                spin_lock_irqsave(&s->lock, flags);
                x = inb(HOST_DATA_IO(s->io_base));
@@ -419,7 +406,7 @@ static int host_startup_ack(struct soundscape *s, unsigned timeout)
                unsigned long flags;
                unsigned char x;
-                sleep(1, TASK_INTERRUPTIBLE);
+                schedule_timeout_interruptible(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 0c3c951009d8..abd79b781412 100644
--- a/sound/isa/wavefront/wavefront_synth.c
+++ b/sound/isa/wavefront/wavefront_synth.c
@@ -275,8 +275,7 @@ static int
 wavefront_sleep (int limit)
 {
-        set_current_state(TASK_INTERRUPTIBLE);
+        schedule_timeout_interruptible(limit);
-        schedule_timeout(limit);
        return signal_pending(current);
 }
@@ -1788,8 +1787,7 @@ wavefront_should_cause_interrupt (snd_wavefront_t *dev,
        outb (val,port);
        spin_unlock_irq(&dev->irq_lock);
        while (1) {
-                set_current_state(TASK_INTERRUPTIBLE);
+                if ((timeout = schedule_timeout_interruptible(timeout)) == 0)
-                if ((timeout = schedule_timeout(timeout)) == 0)
                        return;
                if (dev->irq_ok)
                        return;
diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c
index bbc409ae7ee9..3b589104510b 100644
--- a/sound/pci/ac97/ac97_codec.c
+++ b/sound/pci/ac97/ac97_codec.c
@@ -1745,8 +1745,7 @@ static int ac97_reset_wait(ac97_t *ac97, int timeout, int with_modem)
                        if ((snd_ac97_read(ac97, AC97_REC_GAIN) & 0x7fff) == 0x0a05)
                                return 0;
                }
-                set_current_state(TASK_UNINTERRUPTIBLE);
+                schedule_timeout_uninterruptible(1);
-                schedule_timeout(1);
        } while (time_after_eq(end_time, jiffies));
        return -ENODEV;
 }
@@ -1992,8 +1991,7 @@ int snd_ac97_mixer(ac97_bus_t *bus, ac97_template_t *template, ac97_t **rac97)
                do {
                        if ((snd_ac97_read(ac97, AC97_POWERDOWN) & 0x0f) == 0x0f)
                                goto __ready_ok;
-                        set_current_state(TASK_UNINTERRUPTIBLE);
+                        schedule_timeout_uninterruptible(1);
-                        schedule_timeout(1);
                } while (time_after_eq(end_time, jiffies));
                snd_printk(KERN_WARNING "AC'97 %d analog subsections not ready\n", ac97->num);
        }
@@ -2025,8 +2023,7 @@ int snd_ac97_mixer(ac97_bus_t *bus, ac97_template_t *template, ac97_t **rac97)
                do {
                        if ((snd_ac97_read(ac97, AC97_EXTENDED_MSTATUS) & tmp) == tmp)
                                goto __ready_ok;
-                        set_current_state(TASK_UNINTERRUPTIBLE);
+                        schedule_timeout_uninterruptible(1);
-                        schedule_timeout(1);
                } while (time_after_eq(end_time, jiffies));
                snd_printk(KERN_WARNING "MC'97 %d converters and GPIO not ready (0x%x)\n", ac97->num, snd_ac97_read(ac97, AC97_EXTENDED_MSTATUS));
        }
@@ -2260,8 +2257,7 @@ void snd_ac97_resume(ac97_t *ac97)
                do {
                        if (snd_ac97_read(ac97, AC97_MASTER) == 0x8101)
                                break;
-                        set_current_state(TASK_UNINTERRUPTIBLE);
+                        schedule_timeout_uninterruptible(1);
-                        schedule_timeout(1);
                } while (time_after_eq(end_time, jiffies));
                /* FIXME: extra delay */
                ac97->bus->ops->write(ac97, AC97_MASTER, 0x8000);
@@ -2273,8 +2269,7 @@ void snd_ac97_resume(ac97_t *ac97)
                        unsigned short val = snd_ac97_read(ac97, AC97_EXTENDED_MID);
                        if (val != 0xffff && (val & 1) != 0)
                                break;
-                        set_current_state(TASK_UNINTERRUPTIBLE);
+                        schedule_timeout_uninterruptible(1);
-                        schedule_timeout(1);
                } while (time_after_eq(end_time, jiffies));
        }
 __reset_ready:
diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c
index e33653439cb5..4e76c4a636d9 100644
--- a/sound/pci/ali5451/ali5451.c
+++ b/sound/pci/ali5451/ali5451.c
@@ -398,10 +398,8 @@ static int snd_ali_codec_ready(	ali_t *codec,
                res = snd_ali_5451_peek(codec,port);
                if (! (res & 0x8000))
                        return 0;
-                if (sched) {
+                if (sched)
-                        set_current_state(TASK_UNINTERRUPTIBLE);
+                        schedule_timeout_uninterruptible(1);
-                        schedule_timeout(1);
-                }
        } while (time_after_eq(end_time, jiffies));
        snd_ali_5451_poke(codec, port, res & ~0x8000);
        snd_printdd("ali_codec_ready: codec is not ready.\n ");
@@ -421,10 +419,8 @@ static int snd_ali_stimer_ready(ali_t *codec, int sched)
                dwChk2 = snd_ali_5451_peek(codec, ALI_STIMER);
                if (dwChk2 != dwChk1)
                        return 0;
-                if (sched) {
+                if (sched)
-                        set_current_state(TASK_UNINTERRUPTIBLE);
+                        schedule_timeout_uninterruptible(1);
-                        schedule_timeout(1);
-                }
        } while (time_after_eq(end_time, jiffies));
        snd_printk(KERN_ERR "ali_stimer_read: stimer is not ready.\n");
        return -EIO;
diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c
index a9314363abd8..f5dad9248e39 100644
--- a/sound/pci/atiixp.c
+++ b/sound/pci/atiixp.c
@@ -330,8 +330,7 @@ static int snd_atiixp_update_bits(atiixp_t *chip, unsigned int reg,
 /* delay for one tick */
 #define do_delay() do { \
-        set_current_state(TASK_UNINTERRUPTIBLE); \
+        schedule_timeout_uninterruptible(1); \
-        schedule_timeout(1); \
 } while (0)
diff --git a/sound/pci/atiixp_modem.c b/sound/pci/atiixp_modem.c
index 210eb676945c..0cf202079571 100644
--- a/sound/pci/atiixp_modem.c
+++ b/sound/pci/atiixp_modem.c
@@ -307,8 +307,7 @@ static int snd_atiixp_update_bits(atiixp_t *chip, unsigned int reg,
 /* delay for one tick */
 #define do_delay() do { \
-        set_current_state(TASK_UNINTERRUPTIBLE); \
+        schedule_timeout_uninterruptible(1); \
-        schedule_timeout(1); \
 } while (0)
diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c
index dc87e0144b5a..aea2c47712f9 100644
--- a/sound/pci/cs4281.c
+++ b/sound/pci/cs4281.c
@@ -523,8 +523,7 @@ static void snd_cs4281_delay(unsigned int delay)
                        delay = 1;
                end_time = jiffies + delay;
                do {
-                        set_current_state(TASK_UNINTERRUPTIBLE);
+                        schedule_timeout_uninterruptible(1);
-                        schedule_timeout(1);
                } while (time_after_eq(end_time, jiffies));
        } else {
                udelay(delay);
@@ -533,8 +532,7 @@ static void snd_cs4281_delay(unsigned int delay)
 static inline void snd_cs4281_delay_long(void)
 {
-        set_current_state(TASK_UNINTERRUPTIBLE);
+        schedule_timeout_uninterruptible(1);
-        schedule_timeout(1);
 }
 static inline void snd_cs4281_pokeBA0(cs4281_t *chip, unsigned long offset, unsigned int val)
diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c
index b4d0a9c2b0b5..92ff7c510f2b 100644
--- a/sound/pci/ens1370.c
+++ b/sound/pci/ens1370.c
@@ -576,8 +576,7 @@ static void snd_es1370_codec_write(ak4531_t *ak4531,
                        outw(ES_1370_CODEC_WRITE(reg, val), ES_REG(ensoniq, 1370_CODEC));
                        return;
                }
-                set_current_state(TASK_UNINTERRUPTIBLE);
+                schedule_timeout_uninterruptible(1);
-                schedule_timeout(1);
        } while (time_after(end_time, jiffies));
        snd_printk(KERN_ERR "codec write timeout, status = 0x%x\n", inl(ES_REG(ensoniq, STATUS)));
 }
diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c
index 47dbe317069f..4c7c8d225c7f 100644
--- a/sound/pci/fm801.c
+++ b/sound/pci/fm801.c
@@ -1303,8 +1303,7 @@ static int __devinit snd_fm801_create(snd_card_t * card,
        do {
                if ((inw(FM801_REG(chip, AC97_CMD)) & (3<<8)) == (1<<8))
                        goto __ac97_secondary;
-                set_current_state(TASK_UNINTERRUPTIBLE);
+                schedule_timeout_uninterruptible(1);
-                schedule_timeout(1);
        } while (time_after(timeout, jiffies));
        snd_printk(KERN_ERR "Primary AC'97 codec not found\n");
        snd_fm801_free(chip);
@@ -1329,8 +1328,7 @@ static int __devinit snd_fm801_create(snd_card_t * card,
                                        goto __ac97_ok;
                                }
                        }
-                        set_current_state(TASK_UNINTERRUPTIBLE);
+                        schedule_timeout_uninterruptible(1);
-                        schedule_timeout(1);
                } while (time_after(timeout, jiffies));
        }
@@ -1343,8 +1341,7 @@ static int __devinit snd_fm801_create(snd_card_t * card,
        do {
                if ((inw(FM801_REG(chip, AC97_CMD)) & (3<<8)) == (1<<8))
                        goto __ac97_ok;
-                set_current_state(TASK_UNINTERRUPTIBLE);
+                schedule_timeout_uninterruptible(1);
-                schedule_timeout(1);
        } while (time_after(timeout, jiffies));
        snd_printk(KERN_ERR "Primary AC'97 codec not responding\n");
        snd_fm801_free(chip);
diff --git a/sound/pci/ice1712/pontis.c b/sound/pci/ice1712/pontis.c
index a5f852b1f575..773a1ecb75ce 100644
--- a/sound/pci/ice1712/pontis.c
+++ b/sound/pci/ice1712/pontis.c
@@ -794,8 +794,7 @@ static int __devinit pontis_init(ice1712_t *ice)
        /* initialize WM8776 codec */
        for (i = 0; i < ARRAY_SIZE(wm_inits); i += 2)
                wm_put(ice, wm_inits[i], wm_inits[i+1]);
-        set_current_state(TASK_UNINTERRUPTIBLE);
+        schedule_timeout_uninterruptible(1);
-        schedule_timeout(1);
        for (i = 0; i < ARRAY_SIZE(wm_inits2); i += 2)
                wm_put(ice, wm_inits2[i], wm_inits2[i+1]);
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index 383a3ac5ecba..c2f050215321 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -2144,8 +2144,7 @@ static void do_ali_reset(intel8x0_t *chip)
 }
 #define do_delay(chip) do {\
-        set_current_state(TASK_UNINTERRUPTIBLE);\
+        schedule_timeout_uninterruptible(1);\
-        schedule_timeout(1);\
 } while (0)
 static int snd_intel8x0_ich_chip_init(intel8x0_t *chip, int probing)
diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c
index 49a9f4d08963..acfb197a833c 100644
--- a/sound/pci/intel8x0m.c
+++ b/sound/pci/intel8x0m.c
@@ -890,8 +890,7 @@ static int __devinit snd_intel8x0_mixer(intel8x0_t *chip, int ac97_clock)
 */
 #define do_delay(chip) do {\
-        set_current_state(TASK_UNINTERRUPTIBLE);\
+        schedule_timeout_uninterruptible(1);\
-        schedule_timeout(1);\
 } while (0)
 static int snd_intel8x0m_ich_chip_init(intel8x0_t *chip, int probing)
diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c
index ad77b4145824..99eb76c56f81 100644
--- a/sound/pci/maestro3.c
+++ b/sound/pci/maestro3.c
@@ -2046,8 +2046,7 @@ static void snd_m3_ac97_reset(m3_t *chip)
                outw(0, io + GPIO_DATA);
                outw(dir | GPO_PRIMARY_AC97, io + GPIO_DIRECTION);
-                set_current_state(TASK_UNINTERRUPTIBLE);
+                schedule_timeout_uninterruptible(msecs_to_jiffies(delay1));
-                schedule_timeout((delay1 * HZ) / 1000);
                outw(GPO_PRIMARY_AC97, io + GPIO_DATA);
                udelay(5);
@@ -2055,8 +2054,7 @@ static void snd_m3_ac97_reset(m3_t *chip)
                outw(IO_SRAM_ENABLE | SERIAL_AC_LINK_ENABLE, io + RING_BUS_CTRL_A);
                outw(~0, io + GPIO_MASK);
-                set_current_state(TASK_UNINTERRUPTIBLE);
+                schedule_timeout_uninterruptible(msecs_to_jiffies(delay2));
-                schedule_timeout((delay2 * HZ) / 1000);
                if (! snd_m3_try_read_vendor(chip))
                        break;
@@ -2101,8 +2099,7 @@ static int __devinit snd_m3_mixer(m3_t *chip)
        /* seems ac97 PCM needs initialization.. hack hack.. */
        snd_ac97_write(chip->ac97, AC97_PCM, 0x8000 | (15 << 8) | 15);
-        set_current_state(TASK_UNINTERRUPTIBLE);
+        schedule_timeout_uninterruptible(msecs_to_jiffies(100));
-        schedule_timeout(HZ / 10);
        snd_ac97_write(chip->ac97, AC97_PCM, 0);
        memset(&id, 0, sizeof(id));
diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c
index 1a62c7f6c52b..c341c99ec783 100644
--- a/sound/pci/mixart/mixart.c
+++ b/sound/pci/mixart/mixart.c
@@ -451,8 +451,7 @@ static int mixart_sync_nonblock_events(mixart_mgr_t *mgr)
                        snd_printk(KERN_ERR "mixart: cannot process nonblock events!\n");
                        return -EBUSY;
                }
-                set_current_state(TASK_UNINTERRUPTIBLE);
+                schedule_timeout_uninterruptible(1);
-                schedule_timeout(1);
        }
        return 0;
 }
diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c
index 08226f523eb8..b9b93c7faafd 100644
--- a/sound/pci/trident/trident_main.c
+++ b/sound/pci/trident/trident_main.c
@@ -3207,8 +3207,7 @@ static inline void snd_trident_free_gameport(trident_t *chip) { }
 */
 static inline void do_delay(trident_t *chip)
 {
-        set_current_state(TASK_UNINTERRUPTIBLE);
+        schedule_timeout_uninterruptible(1);
-        schedule_timeout(1);
 }
 /*
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c
index 9b2bea866d1b..523eace250f7 100644
--- a/sound/pci/via82xx.c
+++ b/sound/pci/via82xx.c
@@ -2027,8 +2027,7 @@ static int snd_via82xx_chip_init(via82xx_t *chip)
                pci_read_config_byte(chip->pci, VIA_ACLINK_STAT, &pval);
                if (pval & VIA_ACLINK_C00_READY) /* primary codec ready */
                        break;
-                set_current_state(TASK_UNINTERRUPTIBLE);
+                schedule_timeout_uninterruptible(1);
-                schedule_timeout(1);
        } while (time_before(jiffies, end_time));
        if ((val = snd_via82xx_codec_xread(chip)) & VIA_REG_AC97_BUSY)
@@ -2047,8 +2046,7 @@ static int snd_via82xx_chip_init(via82xx_t *chip)
                        chip->ac97_secondary = 1;
                        goto __ac97_ok2;
                }
-                set_current_state(TASK_INTERRUPTIBLE);
+                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 bc7330ace96a..011f0fb63bf9 100644
--- a/sound/pci/via82xx_modem.c
+++ b/sound/pci/via82xx_modem.c
@@ -968,8 +968,7 @@ static int snd_via82xx_chip_init(via82xx_t *chip)
                pci_read_config_byte(chip->pci, VIA_ACLINK_STAT, &pval);
                if (pval & VIA_ACLINK_C00_READY) /* primary codec ready */
                        break;
-                set_current_state(TASK_UNINTERRUPTIBLE);
+                schedule_timeout_uninterruptible(1);
-                schedule_timeout(1);
        } while (time_before(jiffies, end_time));
        if ((val = snd_via82xx_codec_xread(chip)) & VIA_REG_AC97_BUSY)
@@ -987,8 +986,7 @@ static int snd_via82xx_chip_init(via82xx_t *chip)
                        chip->ac97_secondary = 1;
                        goto __ac97_ok2;
                }
-                set_current_state(TASK_INTERRUPTIBLE);
+                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/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
index a53117733d51..88a43e091d77 100644
--- a/sound/pci/ymfpci/ymfpci_main.c
+++ b/sound/pci/ymfpci/ymfpci_main.c
@@ -92,7 +92,7 @@ static int snd_ymfpci_codec_ready(ymfpci_t *chip, int secondary)
                if ((snd_ymfpci_readw(chip, reg) & 0x8000) == 0)
                        return 0;
                set_current_state(TASK_UNINTERRUPTIBLE);
-                schedule_timeout(1);
+                schedule_timeout_uninterruptible(1);
        } while (time_before(jiffies, end_time));
        snd_printk(KERN_ERR "codec_ready: codec %i is not ready [0x%x]\n", secondary, snd_ymfpci_readw(chip, reg));
        return -EBUSY;
@@ -728,8 +728,7 @@ static void snd_ymfpci_irq_wait(ymfpci_t *chip)
                init_waitqueue_entry(&wait, current);
                add_wait_queue(&chip->interrupt_sleep, &wait);
                atomic_inc(&chip->interrupt_sleep_count);
-                set_current_state(TASK_UNINTERRUPTIBLE);
+                schedule_timeout_uninterruptible(msecs_to_jiffies(50));
-                schedule_timeout(HZ/20);
                remove_wait_queue(&chip->interrupt_sleep, &wait);
        }
 }
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index fce6ad62df6c..8818918c4237 100644
--- a/sound/usb/usbaudio.c
+++ b/sound/usb/usbaudio.c
@@ -838,8 +838,7 @@ static int wait_clear_urbs(snd_usb_substream_t *subs)
                }
                if (! alive)
                        break;
-                set_current_state(TASK_UNINTERRUPTIBLE);
+                schedule_timeout_uninterruptible(1);
-                schedule_timeout(1);
        } while (time_before(jiffies, end_time));
        if (alive)
                snd_printk(KERN_ERR "timeout: still %d active urbs..\n", alive);