The last patches to replace with schedule_timeout() don't work as expected.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
void snd_cs4231_mce_down(struct snd_cs4231 *chip)
{
unsigned long flags;
void snd_cs4231_mce_down(struct snd_cs4231 *chip)
{
unsigned long flags;
+ unsigned long end_time;
int timeout;
snd_cs4231_busy_wait(chip);
int timeout;
snd_cs4231_busy_wait(chip);
snd_printdd("(1) jiffies = %lu\n", jiffies);
/* check condition up to 250 ms */
snd_printdd("(1) jiffies = %lu\n", jiffies);
/* check condition up to 250 ms */
- timeout = msecs_to_jiffies(250);
+ end_time = jiffies + msecs_to_jiffies(250);
while (snd_cs4231_in(chip, CS4231_TEST_INIT) &
CS4231_CALIB_IN_PROGRESS) {
while (snd_cs4231_in(chip, CS4231_TEST_INIT) &
CS4231_CALIB_IN_PROGRESS) {
+ if (time_after(jiffies, end_time)) {
snd_printk(KERN_ERR "mce_down - "
"auto calibration time out (2)\n");
return;
}
snd_printk(KERN_ERR "mce_down - "
"auto calibration time out (2)\n");
return;
}
- timeout = schedule_timeout(timeout);
}
snd_printdd("(2) jiffies = %lu\n", jiffies);
/* check condition up to 100 ms */
}
snd_printdd("(2) jiffies = %lu\n", jiffies);
/* check condition up to 100 ms */
- timeout = msecs_to_jiffies(100);
+ end_time = jiffies + msecs_to_jiffies(100);
while (cs4231_inb(chip, CS4231P(REGSEL)) & CS4231_INIT) {
while (cs4231_inb(chip, CS4231P(REGSEL)) & CS4231_INIT) {
+ if (time_after(jiffies, end_time)) {
snd_printk(KERN_ERR "mce_down - auto calibration time out (3)\n");
return;
}
snd_printk(KERN_ERR "mce_down - auto calibration time out (3)\n");
return;
}
- timeout = schedule_timeout(timeout);
}
snd_printdd("(3) jiffies = %lu\n", jiffies);
}
snd_printdd("(3) jiffies = %lu\n", jiffies);
static void snd_cs4231_mce_down(struct snd_cs4231 *chip)
{
unsigned long flags;
static void snd_cs4231_mce_down(struct snd_cs4231 *chip)
{
unsigned long flags;
+ unsigned long end_time;
int timeout;
spin_lock_irqsave(&chip->lock, flags);
int timeout;
spin_lock_irqsave(&chip->lock, flags);
msleep(1);
/* check condition up to 250ms */
msleep(1);
/* check condition up to 250ms */
- timeout = msecs_to_jiffies(250);
+ end_time = jiffies + msecs_to_jiffies(250);
while (snd_cs4231_in(chip, CS4231_TEST_INIT) &
CS4231_CALIB_IN_PROGRESS) {
spin_unlock_irqrestore(&chip->lock, flags);
while (snd_cs4231_in(chip, CS4231_TEST_INIT) &
CS4231_CALIB_IN_PROGRESS) {
spin_unlock_irqrestore(&chip->lock, flags);
+ if (time_after(jiffies, end_time)) {
snd_printk("mce_down - "
"auto calibration time out (2)\n");
return;
}
snd_printk("mce_down - "
"auto calibration time out (2)\n");
return;
}
- timeout = schedule_timeout(timeout);
spin_lock_irqsave(&chip->lock, flags);
}
/* check condition up to 100ms */
spin_lock_irqsave(&chip->lock, flags);
}
/* check condition up to 100ms */
- timeout = msecs_to_jiffies(100);
+ end_time = jiffies + msecs_to_jiffies(100);
while (__cs4231_readb(chip, CS4231U(chip, REGSEL)) & CS4231_INIT) {
spin_unlock_irqrestore(&chip->lock, flags);
while (__cs4231_readb(chip, CS4231U(chip, REGSEL)) & CS4231_INIT) {
spin_unlock_irqrestore(&chip->lock, flags);
+ if (time_after(jiffies, end_time)) {
snd_printk("mce_down - "
"auto calibration time out (3)\n");
return;
}
snd_printk("mce_down - "
"auto calibration time out (3)\n");
return;
}
- timeout = schedule_timeout(timeout);
spin_lock_irqsave(&chip->lock, flags);
}
spin_unlock_irqrestore(&chip->lock, flags);
spin_lock_irqsave(&chip->lock, flags);
}
spin_unlock_irqrestore(&chip->lock, flags);