Merge branches 'release', 'acpi_pm_device_sleep_state' and 'battery' into release

[linux-2.6] / sound / isa / ad1848 / ad1848_lib.c

diff --git a/sound/isa/ad1848/ad1848_lib.c b/sound/isa/ad1848/ad1848_lib.c
index 18355fd66cb5eecc07334a772cc2d763ad3f9ab7..630c90f9ee5091ccf01108f7b7a09aed5e77930d 100644 (file)
--- a/sound/isa/ad1848/ad1848_lib.c
+++ b/sound/isa/ad1848/ad1848_lib.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Routines for control of AD1848/AD1847/CS4248
  *
  *
@@ -20,7 +20,6 @@
  */
 
 #define SNDRV_MAIN_OBJECT_FILE
-#include <sound/driver.h>
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
@@ -35,7 +34,7 @@
 #include <asm/io.h>
 #include <asm/dma.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Routines for control of AD1848/AD1847/CS4248");
 MODULE_LICENSE("GPL");
 
@@ -203,9 +202,8 @@ static void snd_ad1848_mce_up(struct snd_ad1848 *chip)
 
 static void snd_ad1848_mce_down(struct snd_ad1848 *chip)
 {
-       unsigned long flags;
-       int timeout;
-       unsigned long end_time;
+       unsigned long flags, timeout;
+       int reg;
 
        spin_lock_irqsave(&chip->reg_lock, flags);
        for (timeout = 5; timeout > 0; timeout--)
@@ -214,7 +212,7 @@ static void snd_ad1848_mce_down(struct snd_ad1848 *chip)
        for (timeout = 12000; timeout > 0 && (inb(AD1848P(chip, REGSEL)) & AD1848_INIT); timeout--)
                udelay(100);
 
-       snd_printdd("(1) timeout = %d\n", timeout);
+       snd_printdd("(1) timeout = %ld\n", timeout);
 
 #ifdef CONFIG_SND_DEBUG
        if (inb(AD1848P(chip, REGSEL)) & AD1848_INIT)
@@ -222,50 +220,36 @@ static void snd_ad1848_mce_down(struct snd_ad1848 *chip)
 #endif
 
        chip->mce_bit &= ~AD1848_MCE;
-       timeout = inb(AD1848P(chip, REGSEL));
-       outb(chip->mce_bit | (timeout & 0x1f), AD1848P(chip, REGSEL));
-       if (timeout == 0x80)
+       reg = inb(AD1848P(chip, REGSEL));
+       outb(chip->mce_bit | (reg & 0x1f), AD1848P(chip, REGSEL));
+       if (reg == 0x80)
                snd_printk(KERN_WARNING "mce_down [0x%lx]: serious init problem - codec still busy\n", chip->port);
-       if ((timeout & AD1848_MCE) == 0) {
+       if ((reg & AD1848_MCE) == 0) {
                spin_unlock_irqrestore(&chip->reg_lock, flags);
                return;
        }
 
        /*
-        * Wait for (possible -- during init auto-calibration may not be set)
-        * calibration process to start. Needs upto 5 sample periods on AD1848
-        * which at the slowest possible rate of 5.5125 kHz means 907 us.
+        * Wait for auto-calibration (AC) process to finish, i.e. ACI to go low.
+        * It may take up to 5 sample periods (at most 907 us @ 5.5125 kHz) for
+        * the process to _start_, so it is important to wait at least that long
+        * before checking.  Otherwise we might think AC has finished when it
+        * has in fact not begun.  It could take 128 (no AC) or 384 (AC) cycles
+        * for ACI to drop.  This gives a wait of at most 70 ms with a more
+        * typical value of 3-9 ms.
         */
-       spin_unlock_irqrestore(&chip->reg_lock, flags);
-       msleep(1);
-       spin_lock_irqsave(&chip->reg_lock, flags);
-
-       snd_printdd("(2) jiffies = %lu\n", jiffies);
-
-       end_time = jiffies + msecs_to_jiffies(250);
-       while (snd_ad1848_in(chip, AD1848_TEST_INIT) & AD1848_CALIB_IN_PROGRESS) {
-               spin_unlock_irqrestore(&chip->reg_lock, flags);
-               if (time_after(jiffies, end_time)) {
-                       snd_printk(KERN_ERR "mce_down - auto calibration time out (2)\n");
-                       return;
-               }
-               msleep(1);
-               spin_lock_irqsave(&chip->reg_lock, flags);
-       }
-
-       snd_printdd("(3) jiffies = %lu\n", jiffies);
-
-       end_time = jiffies + msecs_to_jiffies(100);
-       while (inb(AD1848P(chip, REGSEL)) & AD1848_INIT) {
+       timeout = jiffies + msecs_to_jiffies(250);
+       do {
                spin_unlock_irqrestore(&chip->reg_lock, flags);
-               if (time_after(jiffies, end_time)) {
-                       snd_printk(KERN_ERR "mce_down - auto calibration time out (3)\n");
-                       return;
-               }
                msleep(1);
                spin_lock_irqsave(&chip->reg_lock, flags);
-       }
+               reg = snd_ad1848_in(chip, AD1848_TEST_INIT) &
+                     AD1848_CALIB_IN_PROGRESS;
+       } while (reg && time_before(jiffies, timeout));
        spin_unlock_irqrestore(&chip->reg_lock, flags);
+       if (reg)
+               snd_printk(KERN_ERR
+                          "mce_down - auto calibration time out (2)\n");
 
        snd_printdd("(4) jiffies = %lu\n", jiffies);
        snd_printd("mce_down - exit = 0x%x\n", inb(AD1848P(chip, REGSEL)));
@@ -393,11 +377,9 @@ static int snd_ad1848_open(struct snd_ad1848 *chip, unsigned int mode)
 {
        unsigned long flags;
 
-       mutex_lock(&chip->open_mutex);
-       if (chip->mode & AD1848_MODE_OPEN) {
-               mutex_unlock(&chip->open_mutex);
+       if (chip->mode & AD1848_MODE_OPEN)
                return -EAGAIN;
-       }
+
        snd_ad1848_mce_down(chip);
 
 #ifdef SNDRV_DEBUG_MCE
@@ -438,7 +420,6 @@ static int snd_ad1848_open(struct snd_ad1848 *chip, unsigned int mode)
        spin_unlock_irqrestore(&chip->reg_lock, flags);
 
        chip->mode = mode;
-       mutex_unlock(&chip->open_mutex);
 
        return 0;
 }
@@ -447,11 +428,8 @@ static void snd_ad1848_close(struct snd_ad1848 *chip)
 {
        unsigned long flags;
 
-       mutex_lock(&chip->open_mutex);
-       if (!chip->mode) {
-               mutex_unlock(&chip->open_mutex);
+       if (!chip->mode)
                return;
-       }
        /* disable IRQ */
        spin_lock_irqsave(&chip->reg_lock, flags);
        outb(0, AD1848P(chip, STATUS)); /* clear IRQ */
@@ -477,7 +455,6 @@ static void snd_ad1848_close(struct snd_ad1848 *chip)
        spin_unlock_irqrestore(&chip->reg_lock, flags);
 
        chip->mode = 0;
-       mutex_unlock(&chip->open_mutex);
 }
 
 /*
@@ -895,7 +872,6 @@ int snd_ad1848_create(struct snd_card *card,
        if (chip == NULL)
                return -ENOMEM;
        spin_lock_init(&chip->reg_lock);
-       mutex_init(&chip->open_mutex);
        chip->card = card;
        chip->port = port;
        chip->irq = -1;