ALSA: isa/*: Add missing KERN_* prefix to printk

Signed-off-by: Takashi Iwai <tiwai@suse.de>

7 files changed, 59 insertions, 37 deletions

diff --git a/sound/isa/ad1816a/ad1816a_lib.c b/sound/isa/ad1816a/ad1816a_lib.c
index 1c9e01ecac0b..05aef8b97e96 100644
--- a/sound/isa/ad1816a/ad1816a_lib.c
+++ b/sound/isa/ad1816a/ad1816a_lib.c
@@ -37,7 +37,7 @@ static inline int snd_ad1816a_busy_wait(struct snd_ad1816a *chip)
                 if (inb(AD1816A_REG(AD1816A_CHIP_STATUS)) & AD1816A_READY)
                         return 0;
 
-        snd_printk("chip busy.\n");
+        snd_printk(KERN_WARNING "chip busy.\n");
         return -EBUSY;
 }
 
@@ -196,7 +196,7 @@ static int snd_ad1816a_trigger(struct snd_ad1816a *chip, unsigned char what,
                 spin_unlock(&chip->lock);
                 break;
         default:
-                snd_printk("invalid trigger mode 0x%x.\n", what);
+                snd_printk(KERN_WARNING "invalid trigger mode 0x%x.\n", what);
                 error = -EINVAL;
         }
 
@@ -565,7 +565,7 @@ static const char __devinit *snd_ad1816a_chip_id(struct snd_ad1816a *chip)
         case AD1816A_HW_AD1815: return "AD1815";
         case AD1816A_HW_AD18MAX10: return "AD18max10";
         default:
-                snd_printk("Unknown chip version %d:%d.\n",
+                snd_printk(KERN_WARNING "Unknown chip version %d:%d.\n",
                         chip->version, chip->hardware);
                 return "AD1816A - unknown";
         }
diff --git a/sound/isa/cs423x/cs4236_lib.c b/sound/isa/cs423x/cs4236_lib.c
index 6a85fdc53b60..2406efdfd8dd 100644
--- a/sound/isa/cs423x/cs4236_lib.c
+++ b/sound/isa/cs423x/cs4236_lib.c
@@ -286,7 +286,8 @@ int snd_cs4236_create(struct snd_card *card,
         if (hardware == WSS_HW_DETECT)
                 hardware = WSS_HW_DETECT3;
         if (cport < 0x100) {
-                snd_printk("please, specify control port for CS4236+ chips\n");
+                snd_printk(KERN_ERR "please, specify control port "
+                           "for CS4236+ chips\n");
                 return -ENODEV;
         }
         err = snd_wss_create(card, port, cport,
@@ -295,7 +296,8 @@ int snd_cs4236_create(struct snd_card *card,
                 return err;
 
         if (!(chip->hardware & WSS_HW_CS4236B_MASK)) {
-                snd_printk("CS4236+: MODE3 and extended registers not available, hardware=0x%x\n",chip->hardware);
+                snd_printk(KERN_ERR "CS4236+: MODE3 and extended registers "
+                           "not available, hardware=0x%x\n", chip->hardware);
                 snd_device_free(card, chip);
                 return -ENODEV;
         }
@@ -303,16 +305,19 @@ int snd_cs4236_create(struct snd_card *card,
         {
                 int idx;
                 for (idx = 0; idx < 8; idx++)
-                        snd_printk("CD%i = 0x%x\n", idx, inb(chip->cport + idx));
+                        snd_printk(KERN_DEBUG "CD%i = 0x%x\n",
+                                   idx, inb(chip->cport + idx));
                 for (idx = 0; idx < 9; idx++)
-                        snd_printk("C%i = 0x%x\n", idx, snd_cs4236_ctrl_in(chip, idx));
+                        snd_printk(KERN_DEBUG "C%i = 0x%x\n",
+                                   idx, snd_cs4236_ctrl_in(chip, idx));
         }
 #endif
         ver1 = snd_cs4236_ctrl_in(chip, 1);
         ver2 = snd_cs4236_ext_in(chip, CS4236_VERSION);
         snd_printdd("CS4236: [0x%lx] C1 (version) = 0x%x, ext = 0x%x\n", cport, ver1, ver2);
         if (ver1 != ver2) {
-                snd_printk("CS4236+ chip detected, but control port 0x%lx is not valid\n", cport);
+                snd_printk(KERN_ERR "CS4236+ chip detected, but "
+                           "control port 0x%lx is not valid\n", cport);
                 snd_device_free(card, chip);
                 return -ENODEV;
         }
@@ -883,7 +888,8 @@ static int snd_cs4236_get_iec958_switch(struct snd_kcontrol *kcontrol, struct sn
         spin_lock_irqsave(&chip->reg_lock, flags);
         ucontrol->value.integer.value[0] = chip->image[CS4231_ALT_FEATURE_1] & 0x02 ? 1 : 0;
 #if 0
-        printk("get valid: ALT = 0x%x, C3 = 0x%x, C4 = 0x%x, C5 = 0x%x, C6 = 0x%x, C8 = 0x%x\n",
+        printk(KERN_DEBUG "get valid: ALT = 0x%x, C3 = 0x%x, C4 = 0x%x, "
+               "C5 = 0x%x, C6 = 0x%x, C8 = 0x%x\n",
                         snd_wss_in(chip, CS4231_ALT_FEATURE_1),
                         snd_cs4236_ctrl_in(chip, 3),
                         snd_cs4236_ctrl_in(chip, 4),
@@ -920,7 +926,8 @@ static int snd_cs4236_put_iec958_switch(struct snd_kcontrol *kcontrol, struct sn
         mutex_unlock(&chip->mce_mutex);
 
 #if 0
-        printk("set valid: ALT = 0x%x, C3 = 0x%x, C4 = 0x%x, C5 = 0x%x, C6 = 0x%x, C8 = 0x%x\n",
+        printk(KERN_DEBUG "set valid: ALT = 0x%x, C3 = 0x%x, C4 = 0x%x, "
+               "C5 = 0x%x, C6 = 0x%x, C8 = 0x%x\n",
                         snd_wss_in(chip, CS4231_ALT_FEATURE_1),
                         snd_cs4236_ctrl_in(chip, 3),
                         snd_cs4236_ctrl_in(chip, 4),
diff --git a/sound/isa/es1688/es1688_lib.c b/sound/isa/es1688/es1688_lib.c
index 4fbb508a817f..4c6e14f87f2d 100644
--- a/sound/isa/es1688/es1688_lib.c
+++ b/sound/isa/es1688/es1688_lib.c
@@ -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);
diff --git a/sound/isa/opl3sa2.c b/sound/isa/opl3sa2.c
index 58c972b2af03..06810dfb9d9a 100644
--- a/sound/isa/opl3sa2.c
+++ b/sound/isa/opl3sa2.c
@@ -179,12 +179,13 @@ static unsigned char __snd_opl3sa2_read(struct snd_opl3sa2 *chip, unsigned char
         unsigned char result;
 #if 0
         outb(0x1d, port);       /* password */
-        printk("read [0x%lx] = 0x%x\n", port, inb(port));
+        printk(KERN_DEBUG "read [0x%lx] = 0x%x\n", port, inb(port));
 #endif
         outb(reg, chip->port);  /* register */
         result = inb(chip->port + 1);
 #if 0
-        printk("read [0x%lx] = 0x%x [0x%x]\n", port, result, inb(port));
+        printk(KERN_DEBUG "read [0x%lx] = 0x%x [0x%x]\n",
+               port, result, inb(port));
 #endif
         return result;
 }
@@ -233,7 +234,10 @@ static int __devinit snd_opl3sa2_detect(struct snd_card *card)
                 snd_printk(KERN_ERR PFX "can't grab port 0x%lx\n", port);
                 return -EBUSY;
         }
-        // snd_printk("REG 0A = 0x%x\n", snd_opl3sa2_read(chip, 0x0a));
+        /*
+        snd_printk(KERN_DEBUG "REG 0A = 0x%x\n",
+                   snd_opl3sa2_read(chip, 0x0a));
+        */
         chip->version = 0;
         tmp = snd_opl3sa2_read(chip, OPL3SA2_MISC);
         if (tmp == 0xff) {
diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c
index 5deb7e69a029..d5bc0e03132a 100644
--- a/sound/isa/opti9xx/opti92x-ad1848.c
+++ b/sound/isa/opti9xx/opti92x-ad1848.c
@@ -252,7 +252,7 @@ static int __devinit snd_opti9xx_init(struct snd_opti9xx *chip,
 #endif  /* OPTi93X */
 
         default:
-                snd_printk("chip %d not supported\n", hardware);
+                snd_printk(KERN_ERR "chip %d not supported\n", hardware);
                 return -ENODEV;
         }
         return 0;
@@ -294,7 +294,7 @@ static unsigned char snd_opti9xx_read(struct snd_opti9xx *chip,
 #endif  /* OPTi93X */
 
         default:
-                snd_printk("chip %d not supported\n", chip->hardware);
+                snd_printk(KERN_ERR "chip %d not supported\n", chip->hardware);
         }
 
         spin_unlock_irqrestore(&chip->lock, flags);
@@ -336,7 +336,7 @@ static void snd_opti9xx_write(struct snd_opti9xx *chip, unsigned char reg,
 #endif  /* OPTi93X */
 
         default:
-                snd_printk("chip %d not supported\n", chip->hardware);
+                snd_printk(KERN_ERR "chip %d not supported\n", chip->hardware);
         }
 
         spin_unlock_irqrestore(&chip->lock, flags);
@@ -412,7 +412,7 @@ static int __devinit snd_opti9xx_configure(struct snd_opti9xx *chip)
 #endif  /* OPTi93X */
 
         default:
-                snd_printk("chip %d not supported\n", chip->hardware);
+                snd_printk(KERN_ERR "chip %d not supported\n", chip->hardware);
                 return -EINVAL;
         }
 
@@ -430,7 +430,8 @@ static int __devinit snd_opti9xx_configure(struct snd_opti9xx *chip)
                 wss_base_bits = 0x02;
                 break;
         default:
-                snd_printk("WSS port 0x%lx not valid\n", chip->wss_base);
+                snd_printk(KERN_WARNING "WSS port 0x%lx not valid\n",
+                           chip->wss_base);
                 goto __skip_base;
         }
         snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(1), wss_base_bits << 4, 0x30);
@@ -455,7 +456,7 @@ __skip_base:
                 irq_bits = 0x04;
                 break;
         default:
-                snd_printk("WSS irq # %d not valid\n", chip->irq);
+                snd_printk(KERN_WARNING "WSS irq # %d not valid\n", chip->irq);
                 goto __skip_resources;
         }
 
@@ -470,13 +471,14 @@ __skip_base:
                 dma_bits = 0x03;
                 break;
         default:
-                snd_printk("WSS dma1 # %d not valid\n", chip->dma1);
+                snd_printk(KERN_WARNING "WSS dma1 # %d not valid\n",
+                           chip->dma1);
                 goto __skip_resources;
         }
 
 #if defined(CS4231) || defined(OPTi93X)
         if (chip->dma1 == chip->dma2) {
-                snd_printk("don't want to share dmas\n");
+                snd_printk(KERN_ERR "don't want to share dmas\n");
                 return -EBUSY;
         }
 
@@ -485,7 +487,8 @@ __skip_base:
         case 1:
                 break;
         default:
-                snd_printk("WSS dma2 # %d not valid\n", chip->dma2);
+                snd_printk(KERN_WARNING "WSS dma2 # %d not valid\n",
+                           chip->dma2);
                 goto __skip_resources;
         }
         dma_bits |= 0x04;
@@ -516,7 +519,8 @@ __skip_resources:
                         mpu_port_bits = 0x00;
                         break;
                 default:
-                        snd_printk("MPU-401 port 0x%lx not valid\n",
+                        snd_printk(KERN_WARNING
+                                   "MPU-401 port 0x%lx not valid\n",
                                 chip->mpu_port);
                         goto __skip_mpu;
                 }
@@ -535,7 +539,7 @@ __skip_resources:
                         mpu_irq_bits = 0x01;
                         break;
                 default:
-                        snd_printk("MPU-401 irq # %d not valid\n",
+                        snd_printk(KERN_WARNING "MPU-401 irq # %d not valid\n",
                                 chip->mpu_irq);
                         goto __skip_mpu;
                 }
@@ -726,7 +730,7 @@ static int __devinit snd_opti9xx_probe(struct snd_card *card)
         if (chip->wss_base == SNDRV_AUTO_PORT) {
                 chip->wss_base = snd_legacy_find_free_ioport(possible_ports, 4);
                 if (chip->wss_base < 0) {
-                        snd_printk("unable to find a free WSS port\n");
+                        snd_printk(KERN_ERR "unable to find a free WSS port\n");
                         return -EBUSY;
                 }
         }
@@ -891,7 +895,7 @@ static int __devinit snd_opti9xx_isa_probe(struct device *devptr,
 #if defined(CS4231) || defined(OPTi93X)
         if (dma2 == SNDRV_AUTO_DMA) {
                 if ((dma2 = snd_legacy_find_free_dma(possible_dma2s[dma1 % 4])) < 0) {
-                        snd_printk("unable to find a free DMA2\n");
+                        snd_printk(KERN_ERR "unable to find a free DMA2\n");
                         return -EBUSY;
                 }
         }
diff --git a/sound/isa/wavefront/wavefront.c b/sound/isa/wavefront/wavefront.c
index 4c095bc7c729..c280e6220aee 100644
--- a/sound/isa/wavefront/wavefront.c
+++ b/sound/isa/wavefront/wavefront.c
@@ -551,11 +551,11 @@ static int __devinit snd_wavefront_isa_match(struct device *pdev,
                 return 0;
 #endif
         if (cs4232_pcm_port[dev] == SNDRV_AUTO_PORT) {
-                snd_printk("specify CS4232 port\n");
+                snd_printk(KERN_ERR "specify CS4232 port\n");
                 return 0;
         }
         if (ics2115_port[dev] == SNDRV_AUTO_PORT) {
-                snd_printk("specify ICS2115 port\n");
+                snd_printk(KERN_ERR "specify ICS2115 port\n");
                 return 0;
         }
         return 1;
diff --git a/sound/isa/wavefront/wavefront_synth.c b/sound/isa/wavefront/wavefront_synth.c
index 4c410820a994..beb312cca75b 100644
--- a/sound/isa/wavefront/wavefront_synth.c
+++ b/sound/isa/wavefront/wavefront_synth.c
@@ -633,7 +633,7 @@ wavefront_get_sample_status (snd_wavefront_t *dev, int assume_rom)
                 wbuf[1] = i >> 7;
 
                 if (snd_wavefront_cmd (dev, WFC_IDENTIFY_SAMPLE_TYPE, rbuf, wbuf)) {
-                        snd_printk("cannot identify sample "
+                        snd_printk(KERN_WARNING "cannot identify sample "
                                    "type of slot %d\n", i);
                         dev->sample_status[i] = WF_ST_EMPTY;
                         continue;