]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - sound/isa/es1688/es1688_lib.c
OMAP1: clock: Typo fix for clock in omap1
[linux-2.6-omap-h63xx.git] / sound / isa / es1688 / es1688_lib.c
index 4fbb508a817f39485406800431c87fc7130c8450..4c6e14f87f2d816c4f843bed883aec20c1bd732e 100644 (file)
@@ -45,7 +45,7 @@ static int snd_es1688_dsp_command(struct snd_es1688 *chip, unsigned char val)
                        return 1;
                }
 #ifdef CONFIG_SND_DEBUG
-       printk("snd_es1688_dsp_command: timeout (0x%x)\n", val);
+       printk(KERN_DEBUG "snd_es1688_dsp_command: timeout (0x%x)\n", val);
 #endif
        return 0;
 }
@@ -167,13 +167,16 @@ static int snd_es1688_probe(struct snd_es1688 *chip)
        hw = ES1688_HW_AUTO;
        switch (chip->version & 0xfff0) {
        case 0x4880:
-               snd_printk("[0x%lx] ESS: AudioDrive ES488 detected, but driver is in another place\n", chip->port);
+               snd_printk(KERN_ERR "[0x%lx] ESS: AudioDrive ES488 detected, "
+                          "but driver is in another place\n", chip->port);
                return -ENODEV;
        case 0x6880:
                hw = (chip->version & 0x0f) >= 8 ? ES1688_HW_1688 : ES1688_HW_688;
                break;
        default:
-               snd_printk("[0x%lx] ESS: unknown AudioDrive chip with version 0x%x (Jazz16 soundcard?)\n", chip->port, chip->version);
+               snd_printk(KERN_ERR "[0x%lx] ESS: unknown AudioDrive chip "
+                          "with version 0x%x (Jazz16 soundcard?)\n",
+                          chip->port, chip->version);
                return -ENODEV;
        }
 
@@ -223,7 +226,7 @@ static int snd_es1688_init(struct snd_es1688 * chip, int enable)
                }
        }
 #if 0
-       snd_printk("mpu cfg = 0x%x\n", cfg);
+       snd_printk(KERN_DEBUG "mpu cfg = 0x%x\n", cfg);
 #endif
        spin_lock_irqsave(&chip->reg_lock, flags);
        snd_es1688_mixer_write(chip, 0x40, cfg);
@@ -237,7 +240,9 @@ static int snd_es1688_init(struct snd_es1688 * chip, int enable)
                cfg = 0xf0;     /* enable only DMA counter interrupt */
                irq_bits = irqs[chip->irq & 0x0f];
                if (irq_bits < 0) {
-                       snd_printk("[0x%lx] ESS: bad IRQ %d for ES1688 chip!!\n", chip->port, chip->irq);
+                       snd_printk(KERN_ERR "[0x%lx] ESS: bad IRQ %d "
+                                  "for ES1688 chip!!\n",
+                                  chip->port, chip->irq);
 #if 0
                        irq_bits = 0;
                        cfg = 0x10;
@@ -250,7 +255,8 @@ static int snd_es1688_init(struct snd_es1688 * chip, int enable)
                cfg = 0xf0;     /* extended mode DMA enable */
                dma = chip->dma8;
                if (dma > 3 || dma == 2) {
-                       snd_printk("[0x%lx] ESS: bad DMA channel %d for ES1688 chip!!\n", chip->port, dma);
+                       snd_printk(KERN_ERR "[0x%lx] ESS: bad DMA channel %d "
+                                  "for ES1688 chip!!\n", chip->port, dma);
 #if 0
                        dma_bits = 0;
                        cfg = 0x00;     /* disable all DMA */
@@ -341,8 +347,9 @@ static int snd_es1688_trigger(struct snd_es1688 *chip, int cmd, unsigned char va
                return -EINVAL; /* something is wrong */
        }
 #if 0
-       printk("trigger: val = 0x%x, value = 0x%x\n", val, value);
-       printk("trigger: pointer = 0x%x\n", snd_dma_pointer(chip->dma8, chip->dma_size));
+       printk(KERN_DEBUG "trigger: val = 0x%x, value = 0x%x\n", val, value);
+       printk(KERN_DEBUG "trigger: pointer = 0x%x\n",
+              snd_dma_pointer(chip->dma8, chip->dma_size));
 #endif
        snd_es1688_write(chip, 0xb8, (val & 0xf0) | value);
        spin_unlock(&chip->reg_lock);