[ALSA] Add missing KERN_* suffix to printk

Add missing KERN_* suffix to printk.

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

39 files changed, 181 insertions, 179 deletions

diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c
index 1f747c3034fe..e33653439cb5 100644
--- a/sound/pci/ali5451/ali5451.c
+++ b/sound/pci/ali5451/ali5451.c
@@ -426,7 +426,7 @@ static int snd_ali_stimer_ready(ali_t *codec, int sched)
                         schedule_timeout(1);
                 }
         } while (time_after_eq(end_time, jiffies));
-        snd_printk("ali_stimer_read: stimer is not ready.\n");
+        snd_printk(KERN_ERR "ali_stimer_read: stimer is not ready.\n");
         return -EIO;
 }
 
@@ -438,7 +438,7 @@ static void snd_ali_codec_poke(ali_t *codec,int secondary,
         unsigned int port = 0;
 
         if (reg >= 0x80) {
-                snd_printk("ali_codec_poke: reg(%xh) invalid.\n", reg);
+                snd_printk(KERN_ERR "ali_codec_poke: reg(%xh) invalid.\n", reg);
                 return;
         }
 
@@ -467,7 +467,7 @@ static unsigned short snd_ali_codec_peek( ali_t *codec,
         unsigned int port = 0;
 
         if (reg >= 0x80) {
-                snd_printk("ali_codec_peek: reg(%xh) invalid.\n", reg);
+                snd_printk(KERN_ERR "ali_codec_peek: reg(%xh) invalid.\n", reg);
                 return ~0;
         }
 
@@ -671,7 +671,7 @@ static int snd_ali_alloc_pcm_channel(ali_t *codec, int channel)
         unsigned int idx =  channel & 0x1f;
 
         if (codec->synth.chcnt >= ALI_CHANNELS){
-                snd_printk("ali_alloc_pcm_channel: no free channels.\n");
+                snd_printk(KERN_ERR "ali_alloc_pcm_channel: no free channels.\n");
                 return -1;
         }
 
@@ -702,7 +702,7 @@ static int snd_ali_find_free_channel(ali_t * codec, int rec)
                 if ((result = snd_ali_alloc_pcm_channel(codec,idx)) >= 0) {
                         return result;
                 } else {
-                        snd_printk("ali_find_free_channel: record channel is busy now.\n");
+                        snd_printk(KERN_ERR "ali_find_free_channel: record channel is busy now.\n");
                         return -1;
                 }
         }
@@ -714,7 +714,7 @@ static int snd_ali_find_free_channel(ali_t * codec, int rec)
                 if ((result = snd_ali_alloc_pcm_channel(codec,idx)) >= 0) {
                         return result;
                 } else {
-                        snd_printk("ali_find_free_channel: S/PDIF out channel is in busy now.\n");
+                        snd_printk(KERN_ERR "ali_find_free_channel: S/PDIF out channel is in busy now.\n");
                 }
         }
 
@@ -722,7 +722,7 @@ static int snd_ali_find_free_channel(ali_t * codec, int rec)
                 if ((result = snd_ali_alloc_pcm_channel(codec,idx)) >= 0)
                         return result;
         }
-        snd_printk("ali_find_free_channel: no free channels.\n");
+        snd_printk(KERN_ERR "ali_find_free_channel: no free channels.\n");
         return -1;
 }
 
@@ -736,7 +736,7 @@ static void snd_ali_free_channel_pcm(ali_t *codec, int channel)
                 return;
 
         if (!(codec->synth.chmap & (1 << idx))) {
-                snd_printk("ali_free_channel_pcm: channel %d is not in use.\n",channel);
+                snd_printk(KERN_ERR "ali_free_channel_pcm: channel %d is not in use.\n",channel);
                 return;
         } else {
                 codec->synth.chmap &= ~(1 << idx);
@@ -798,7 +798,7 @@ static void snd_ali_detect_spdif_rate(ali_t *codec)
         }
 
         if (count > 50000) {
-                snd_printk("ali_detect_spdif_rate: timeout!\n");
+                snd_printk(KERN_ERR "ali_detect_spdif_rate: timeout!\n");
                 return;
         }
 
@@ -811,7 +811,7 @@ static void snd_ali_detect_spdif_rate(ali_t *codec)
         }
 
         if (count > 50000) {
-                snd_printk("ali_detect_spdif_rate: timeout!\n");
+                snd_printk(KERN_ERR "ali_detect_spdif_rate: timeout!\n");
                 return;
         }
 
@@ -1079,7 +1079,7 @@ static snd_ali_voice_t *snd_ali_alloc_voice(ali_t * codec, int type, int rec, in
                 idx = channel > 0 ? snd_ali_alloc_pcm_channel(codec, channel) :
                         snd_ali_find_free_channel(codec,rec);
                 if(idx < 0) {
-                        snd_printk("ali_alloc_voice: err.\n");
+                        snd_printk(KERN_ERR "ali_alloc_voice: err.\n");
                         spin_unlock_irqrestore(&codec->voice_alloc, flags);
                         return NULL;
                 }
@@ -1481,13 +1481,13 @@ static int snd_ali_prepare(snd_pcm_substream_t * substream)
                 }
                 rate = snd_ali_get_spdif_in_rate(codec);
                 if (rate == 0) {
-                        snd_printk("ali_capture_preapre: spdif rate detect err!\n");
+                        snd_printk(KERN_WARNING "ali_capture_preapre: spdif rate detect err!\n");
                         rate = 48000;
                 }
                 bValue = inb(ALI_REG(codec,ALI_SPDIF_CTRL));
                 if (bValue & 0x10) {
                         outb(bValue,ALI_REG(codec,ALI_SPDIF_CTRL));
-                        printk("clear SPDIF parity error flag.\n");
+                        printk(KERN_WARNING "clear SPDIF parity error flag.\n");
                 }
 
                 if (rate != 48000)
@@ -1816,7 +1816,7 @@ static int __devinit snd_ali_pcm(ali_t * codec, int device, struct ali_pcm_descr
         err = snd_pcm_new(codec->card, desc->name, device,
                           desc->playback_num, desc->capture_num, &pcm);
         if (err < 0) {
-                snd_printk("snd_ali_pcm: err called snd_pcm_new.\n");
+                snd_printk(KERN_ERR "snd_ali_pcm: err called snd_pcm_new.\n");
                 return err;
         }
         pcm->private_data = codec;
@@ -1994,7 +1994,7 @@ static int __devinit snd_ali_mixer(ali_t * codec)
         for ( i = 0 ; i < codec->num_of_codecs ; i++) {
                 ac97.num = i;
                 if ((err = snd_ac97_mixer(codec->ac97_bus, &ac97, &codec->ac97[i])) < 0) {
-                        snd_printk("ali mixer %d creating error.\n", i);
+                        snd_printk(KERN_ERR "ali mixer %d creating error.\n", i);
                         if(i == 0)
                                 return err;
                         codec->num_of_codecs = 1;
@@ -2128,7 +2128,7 @@ static int snd_ali_chip_init(ali_t *codec)
         snd_ali_printk("chip initializing ... \n");
 
         if (snd_ali_reset_5451(codec)) {
-                snd_printk("ali_chip_init: reset 5451 error.\n");
+                snd_printk(KERN_ERR "ali_chip_init: reset 5451 error.\n");
                 return -1;
         }
 
@@ -2203,7 +2203,7 @@ static int __devinit snd_ali_resources(ali_t *codec)
         codec->port = pci_resource_start(codec->pci, 0);
 
         if (request_irq(codec->pci->irq, snd_ali_card_interrupt, SA_INTERRUPT|SA_SHIRQ, "ALI 5451", (void *)codec)) {
-                snd_printk("Unable to request irq.\n");
+                snd_printk(KERN_ERR "Unable to request irq.\n");
                 return -EBUSY;
         }
         codec->irq = codec->pci->irq;
@@ -2243,7 +2243,7 @@ static int __devinit snd_ali_create(snd_card_t * card,
         /* check, if we can restrict PCI DMA transfers to 31 bits */
         if (pci_set_dma_mask(pci, 0x7fffffff) < 0 ||
             pci_set_consistent_dma_mask(pci, 0x7fffffff) < 0) {
-                snd_printk("architecture does not support 31bit PCI busmaster DMA\n");
+                snd_printk(KERN_ERR "architecture does not support 31bit PCI busmaster DMA\n");
                 pci_disable_device(pci);
                 return -ENXIO;
         }
@@ -2332,7 +2332,7 @@ static int __devinit snd_ali_create(snd_card_t * card,
         }
 
         if ((err = snd_ali_chip_init(codec)) < 0) {
-                snd_printk("ali create: chip init error.\n");
+                snd_printk(KERN_ERR "ali create: chip init error.\n");
                 return err;
         }
 
diff --git a/sound/pci/als4000.c b/sound/pci/als4000.c
index 8a32cd92f62a..7c61561f297f 100644
--- a/sound/pci/als4000.c
+++ b/sound/pci/als4000.c
@@ -667,7 +667,7 @@ static int __devinit snd_card_als4000_probe(struct pci_dev *pci,
         /* check, if we can restrict PCI DMA transfers to 24 bits */
         if (pci_set_dma_mask(pci, 0x00ffffff) < 0 ||
             pci_set_consistent_dma_mask(pci, 0x00ffffff) < 0) {
-                snd_printk("architecture does not support 24bit PCI busmaster DMA\n");
+                snd_printk(KERN_ERR "architecture does not support 24bit PCI busmaster DMA\n");
                 pci_disable_device(pci);
                 return -ENXIO;
         }
diff --git a/sound/pci/au88x0/au88x0.c b/sound/pci/au88x0/au88x0.c
index 04b695d6fd48..6af3b13f2fd1 100644
--- a/sound/pci/au88x0/au88x0.c
+++ b/sound/pci/au88x0/au88x0.c
@@ -303,7 +303,7 @@ snd_vortex_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
         if (snd_seq_device_new(card, 1, SNDRV_SEQ_DEV_ID_VORTEX_SYNTH,
                                sizeof(snd_vortex_synth_arg_t), &wave) < 0
             || wave == NULL) {
-                snd_printk("Can't initialize Aureal wavetable synth\n");
+                snd_printk(KERN_ERR "Can't initialize Aureal wavetable synth\n");
         } else {
                 snd_vortex_synth_arg_t *arg;
 
diff --git a/sound/pci/au88x0/au88x0_a3d.c b/sound/pci/au88x0/au88x0_a3d.c
index 9ea2ba7bc3c8..d5755db5141f 100644
--- a/sound/pci/au88x0/au88x0_a3d.c
+++ b/sound/pci/au88x0/au88x0_a3d.c
@@ -488,7 +488,7 @@ static void a3dsrc_ZeroStateA3D(a3dsrc_t * a)
         int i, var, var2;
 
         if ((a->vortex) == NULL) {
-                printk("vortex: ZeroStateA3D: ERROR: a->vortex is NULL\n");
+                printk(KERN_ERR "vortex: ZeroStateA3D: ERROR: a->vortex is NULL\n");
                 return;
         }
 
diff --git a/sound/pci/au88x0/au88x0_core.c b/sound/pci/au88x0/au88x0_core.c
index 91ac4f3a2aac..5905188d06b5 100644
--- a/sound/pci/au88x0/au88x0_core.c
+++ b/sound/pci/au88x0/au88x0_core.c
@@ -2033,7 +2033,7 @@ vortex_adb_checkinout(vortex_t * vortex, int resmap[], int out, int restype)
                         }
                 }
         }
-        printk("vortex: FATAL: ResManager: resource type %d exhausted.\n", restype);
+        printk(KERN_ERR "vortex: FATAL: ResManager: resource type %d exhausted.\n", restype);
         return -ENOMEM;
 }
 
@@ -2165,7 +2165,7 @@ vortex_adb_allocroute(vortex_t * vortex, int dma, int nr_ch, int dir, int type)
                                 memset(stream->resources, 0,
                                        sizeof(unsigned char) *
                                        VORTEX_RESOURCE_LAST);
-                                printk("vortex: out of A3D sources. Sorry\n");
+                                printk(KERN_ERR "vortex: out of A3D sources. Sorry\n");
                                 return -EBUSY;
                         }
                         /* (De)Initialize A3D hardware source. */
diff --git a/sound/pci/au88x0/au88x0_eq.c b/sound/pci/au88x0/au88x0_eq.c
index 53b47a42c7d8..9d933cc0ea0b 100644
--- a/sound/pci/au88x0/au88x0_eq.c
+++ b/sound/pci/au88x0/au88x0_eq.c
@@ -854,7 +854,7 @@ snd_vortex_peaks_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
 
         vortex_Eqlzr_GetAllPeaks(vortex, peaks, &count);
         if (count != 20) {
-                printk("vortex: peak count error 20 != %d \n", count);
+                printk(KERN_ERR "vortex: peak count error 20 != %d \n", count);
                 return -1;
         }
         for (i = 0; i < 20; i++)
diff --git a/sound/pci/au88x0/au88x0_synth.c b/sound/pci/au88x0/au88x0_synth.c
index 400417d34609..65f375bad43a 100644
--- a/sound/pci/au88x0/au88x0_synth.c
+++ b/sound/pci/au88x0/au88x0_synth.c
@@ -90,7 +90,7 @@ static int vortex_wt_allocroute(vortex_t * vortex, int wt, int nr_ch)
         hwwrite(vortex->mmio, WT_PARM(wt, 2), 0);
 
         temp = hwread(vortex->mmio, WT_PARM(wt, 3));
-        printk("vortex: WT PARM3: %x\n", temp);
+        printk(KERN_DEBUG "vortex: WT PARM3: %x\n", temp);
         //hwwrite(vortex->mmio, WT_PARM(wt, 3), temp);
 
         hwwrite(vortex->mmio, WT_DELAY(wt, 0), 0);
@@ -98,7 +98,7 @@ static int vortex_wt_allocroute(vortex_t * vortex, int wt, int nr_ch)
         hwwrite(vortex->mmio, WT_DELAY(wt, 2), 0);
         hwwrite(vortex->mmio, WT_DELAY(wt, 3), 0);
 
-        printk("vortex: WT GMODE: %x\n", hwread(vortex->mmio, WT_GMODE(wt)));
+        printk(KERN_DEBUG "vortex: WT GMODE: %x\n", hwread(vortex->mmio, WT_GMODE(wt)));
 
         hwwrite(vortex->mmio, WT_PARM(wt, 2), 0xffffffff);
         hwwrite(vortex->mmio, WT_PARM(wt, 3), 0xcff1c810);
@@ -106,7 +106,7 @@ static int vortex_wt_allocroute(vortex_t * vortex, int wt, int nr_ch)
         voice->parm0 = voice->parm1 = 0xcfb23e2f;
         hwwrite(vortex->mmio, WT_PARM(wt, 0), voice->parm0);
         hwwrite(vortex->mmio, WT_PARM(wt, 1), voice->parm1);
-        printk("vortex: WT GMODE 2 : %x\n", hwread(vortex->mmio, WT_GMODE(wt)));
+        printk(KERN_DEBUG "vortex: WT GMODE 2 : %x\n", hwread(vortex->mmio, WT_GMODE(wt)));
         return 0;
 }
 
@@ -203,7 +203,7 @@ vortex_wt_SetReg(vortex_t * vortex, unsigned char reg, int wt,
                 }
         } else {
                 if (wt >= NR_WT) {
-                        printk("vortex: WT SetReg: voice out of range\n");
+                        printk(KERN_ERR "vortex: WT SetReg: voice out of range\n");
                         return 0;
                 }
         }
diff --git a/sound/pci/azt3328.c b/sound/pci/azt3328.c
index dc638f395c02..8260079a25fd 100644
--- a/sound/pci/azt3328.c
+++ b/sound/pci/azt3328.c
@@ -669,7 +669,7 @@ static void snd_azf3328_setfmt(azf3328_t *chip,
         case 48000: val |= 0x06; break;
         case 64000: val |= 0x07; break;
         default:
-                snd_printk("unknown bitrate %d, assuming 44.1kHz!\n", bitrate);
+                snd_printk(KERN_WARNING "unknown bitrate %d, assuming 44.1kHz!\n", bitrate);
                 val |= 0x05; /* 44100 */
                 break;
         }
@@ -854,10 +854,10 @@ static int snd_azf3328_playback_trigger(snd_pcm_substream_t * substream, int cmd
                 chip->is_playing = 0;
                 break;
         case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-                snd_printk("FIXME: SNDRV_PCM_TRIGGER_PAUSE_PUSH NIY!\n");
+                snd_printk(KERN_ERR "FIXME: SNDRV_PCM_TRIGGER_PAUSE_PUSH NIY!\n");
                 break;
         case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-                snd_printk("FIXME: SNDRV_PCM_TRIGGER_PAUSE_RELEASE NIY!\n");
+                snd_printk(KERN_ERR "FIXME: SNDRV_PCM_TRIGGER_PAUSE_RELEASE NIY!\n");
                 break;
         default:
                 return -EINVAL;
@@ -935,10 +935,10 @@ static int snd_azf3328_capture_trigger(snd_pcm_substream_t * substream, int cmd)
                 chip->is_playing = 0;
                 break;
         case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-                snd_printk("FIXME: SNDRV_PCM_TRIGGER_PAUSE_PUSH NIY!\n");
+                snd_printk(KERN_ERR "FIXME: SNDRV_PCM_TRIGGER_PAUSE_PUSH NIY!\n");
                 break;
         case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-                snd_printk("FIXME: SNDRV_PCM_TRIGGER_PAUSE_RELEASE NIY!\n");
+                snd_printk(KERN_ERR "FIXME: SNDRV_PCM_TRIGGER_PAUSE_RELEASE NIY!\n");
                 break;
         default:
                 return -EINVAL;
@@ -1356,7 +1356,7 @@ static int __devinit snd_azf3328_create(snd_card_t * card,
         /* check if we can restrict PCI DMA transfers to 24 bits */
         if (pci_set_dma_mask(pci, 0x00ffffff) < 0 ||
             pci_set_consistent_dma_mask(pci, 0x00ffffff) < 0) {
-                snd_printk("architecture does not support 24bit PCI busmaster DMA\n");
+                snd_printk(KERN_ERR "architecture does not support 24bit PCI busmaster DMA\n");
                 pci_disable_device(pci);
                 return -ENXIO;
         }
@@ -1374,7 +1374,7 @@ static int __devinit snd_azf3328_create(snd_card_t * card,
         chip->mixer_port = pci_resource_start(pci, 4);
 
         if (request_irq(pci->irq, snd_azf3328_interrupt, SA_INTERRUPT|SA_SHIRQ, card->shortname, (void *)chip)) {
-                snd_printk("unable to grab IRQ %d\n", pci->irq);
+                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_azf3328_free(chip);
                 return -EBUSY;
         }
@@ -1450,7 +1450,7 @@ static int __devinit snd_azf3328_probe(struct pci_dev *pci,
         if ((err = snd_mpu401_uart_new( card, 0, MPU401_HW_MPU401,
                                         chip->mpu_port, 1, pci->irq, 0,
                                         &chip->rmidi)) < 0) {
-                snd_printk("azf3328: no MPU-401 device at 0x%lx?\n", chip->mpu_port);
+                snd_printk(KERN_ERR "azf3328: no MPU-401 device at 0x%lx?\n", chip->mpu_port);
                 snd_card_free(card);
                 return err;
         }
@@ -1462,7 +1462,7 @@ static int __devinit snd_azf3328_probe(struct pci_dev *pci,
 
         if (snd_opl3_create(card, chip->synth_port, chip->synth_port+2,
                             OPL3_HW_AUTO, 1, &opl3) < 0) {
-                snd_printk("azf3328: no OPL3 device at 0x%lx-0x%lx?\n",
+                snd_printk(KERN_ERR "azf3328: no OPL3 device at 0x%lx-0x%lx?\n",
                            chip->synth_port, chip->synth_port+2 );
         } else {
                 if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) < 0) {
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c
index 0d9d8923fbbb..f6920ef5b4ea 100644
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
@@ -281,7 +281,7 @@ int snd_ca0106_i2c_write(ca0106_t *emu,
         int retry;
         if ((reg > 0x7f) || (value > 0x1ff))
         {
-                snd_printk("i2c_write: invalid values.\n");
+                snd_printk(KERN_ERR "i2c_write: invalid values.\n");
                 return -EINVAL;
         }
 
@@ -319,7 +319,7 @@ int snd_ca0106_i2c_write(ca0106_t *emu,
 
         if(retry==10)
         {
-                snd_printk("Writing to ADC failed!\n");
+                snd_printk(KERN_ERR "Writing to ADC failed!\n");
                 return -EINVAL;
         }
     
@@ -421,7 +421,7 @@ static int snd_ca0106_pcm_open_capture_channel(snd_pcm_substream_t *substream, i
 
         epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
         if (epcm == NULL) {
-                snd_printk("open_capture_channel: failed epcm alloc\n");
+                snd_printk(KERN_ERR "open_capture_channel: failed epcm alloc\n");
                 return -ENOMEM;
         }
         epcm->emu = chip;
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c
index db093bca2cd0..57e8e433d56f 100644
--- a/sound/pci/cmipci.c
+++ b/sound/pci/cmipci.c
@@ -2839,7 +2839,7 @@ static int __devinit snd_cmipci_create(snd_card_t *card, struct pci_dev *pci,
         cm->iobase = pci_resource_start(pci, 0);
 
         if (request_irq(pci->irq, snd_cmipci_interrupt, SA_INTERRUPT|SA_SHIRQ, card->driver, (void *)cm)) {
-                snd_printk("unable to grab IRQ %d\n", pci->irq);
+                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_cmipci_free(cm);
                 return -EBUSY;
         }
diff --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c
index 147836f09dcf..9b8af5bcbb04 100644
--- a/sound/pci/cs46xx/cs46xx_lib.c
+++ b/sound/pci/cs46xx/cs46xx_lib.c
@@ -163,7 +163,7 @@ static unsigned short snd_cs46xx_codec_read(cs46xx_t *chip,
                         goto ok1;
         }
 
-        snd_printk("AC'97 read problem (ACCTL_DCV), reg = 0x%x\n", reg);
+        snd_printk(KERN_ERR "AC'97 read problem (ACCTL_DCV), reg = 0x%x\n", reg);
         result = 0xffff;
         goto end;
         
@@ -182,7 +182,7 @@ static unsigned short snd_cs46xx_codec_read(cs46xx_t *chip,
                 udelay(10);
         }
         
-        snd_printk("AC'97 read problem (ACSTS_VSTS), codec_index %d, reg = 0x%x\n", codec_index, reg);
+        snd_printk(KERN_ERR "AC'97 read problem (ACSTS_VSTS), codec_index %d, reg = 0x%x\n", codec_index, reg);
         result = 0xffff;
         goto end;
 
@@ -281,7 +281,7 @@ static void snd_cs46xx_codec_write(cs46xx_t *chip,
                         goto end;
                 }
         }
-        snd_printk("AC'97 write problem, codec_index = %d, reg = 0x%x, val = 0x%x\n", codec_index, reg, val);
+        snd_printk(KERN_ERR "AC'97 write problem, codec_index = %d, reg = 0x%x, val = 0x%x\n", codec_index, reg, val);
  end:
         chip->active_ctrl(chip, -1);
 }
@@ -510,7 +510,7 @@ static void snd_cs46xx_proc_start(cs46xx_t *chip)
         }
 
         if (snd_cs46xx_peek(chip, BA1_SPCR) & SPCR_RUNFR)
-                snd_printk("SPCR_RUNFR never reset\n");
+                snd_printk(KERN_ERR "SPCR_RUNFR never reset\n");
 }
 
 static void snd_cs46xx_proc_stop(cs46xx_t *chip)
@@ -2403,7 +2403,7 @@ static void snd_cs46xx_codec_reset (ac97_t * ac97)
                 msleep(10);
         } while (time_after_eq(end_time, jiffies));
 
-        snd_printk("CS46xx secondary codec dont respond!\n");  
+        snd_printk(KERN_ERR "CS46xx secondary codec doesn't respond!\n");  
 }
 #endif
 
@@ -3072,8 +3072,8 @@ static int snd_cs46xx_chip_init(cs46xx_t *chip)
         }
 
 
-        snd_printk("create - never read codec ready from AC'97\n");
-        snd_printk("it is not probably bug, try to use CS4236 driver\n");
+        snd_printk(KERN_ERR "create - never read codec ready from AC'97\n");
+        snd_printk(KERN_ERR "it is not probably bug, try to use CS4236 driver\n");
         return -EIO;
  ok1:
 #ifdef CONFIG_SND_CS46XX_NEW_DSP
@@ -3121,17 +3121,17 @@ static int snd_cs46xx_chip_init(cs46xx_t *chip)
         }
 
 #ifndef CONFIG_SND_CS46XX_NEW_DSP
-        snd_printk("create - never read ISV3 & ISV4 from AC'97\n");
+        snd_printk(KERN_ERR "create - never read ISV3 & ISV4 from AC'97\n");
         return -EIO;
 #else
         /* This may happen on a cold boot with a Terratec SiXPack 5.1.
            Reloading the driver may help, if there's other soundcards 
            with the same problem I would like to know. (Benny) */
 
-        snd_printk("ERROR: snd-cs46xx: never read ISV3 & ISV4 from AC'97\n");
-        snd_printk("       Try reloading the ALSA driver, if you find something\n");
-        snd_printk("       broken or not working on your soundcard upon\n");
-        snd_printk("       this message please report to alsa-devel@lists.sourceforge.net\n");
+        snd_printk(KERN_ERR "ERROR: snd-cs46xx: never read ISV3 & ISV4 from AC'97\n");
+        snd_printk(KERN_ERR "       Try reloading the ALSA driver, if you find something\n");
+        snd_printk(KERN_ERR "       broken or not working on your soundcard upon\n");
+        snd_printk(KERN_ERR "       this message please report to alsa-devel@lists.sourceforge.net\n");
 
         return -EIO;
 #endif
@@ -3212,7 +3212,7 @@ int __devinit snd_cs46xx_start_dsp(cs46xx_t *chip)
 #else
         /* old image */
         if (snd_cs46xx_download_image(chip) < 0) {
-                snd_printk("image download error\n");
+                snd_printk(KERN_ERR "image download error\n");
                 return -EIO;
         }
 
@@ -3787,7 +3787,7 @@ int __devinit snd_cs46xx_create(snd_card_t * card,
         chip->ba1_addr = pci_resource_start(pci, 1);
         if (chip->ba0_addr == 0 || chip->ba0_addr == (unsigned long)~0 ||
             chip->ba1_addr == 0 || chip->ba1_addr == (unsigned long)~0) {
-                snd_printk("wrong address(es) - ba0 = 0x%lx, ba1 = 0x%lx\n", chip->ba0_addr, chip->ba1_addr);
+                snd_printk(KERN_ERR "wrong address(es) - ba0 = 0x%lx, ba1 = 0x%lx\n", chip->ba0_addr, chip->ba1_addr);
                 snd_cs46xx_free(chip);
                 return -ENOMEM;
         }
@@ -3836,12 +3836,12 @@ int __devinit snd_cs46xx_create(snd_card_t * card,
         }
 
         if (external_amp) {
-                snd_printk("Crystal EAPD support forced on.\n");
+                snd_printk(KERN_INFO "Crystal EAPD support forced on.\n");
                 chip->amplifier_ctrl = amp_voyetra;
         }
 
         if (thinkpad) {
-                snd_printk("Activating CLKRUN hack for Thinkpad.\n");
+                snd_printk(KERN_INFO "Activating CLKRUN hack for Thinkpad.\n");
                 chip->active_ctrl = clkrun_hack;
                 clkrun_init(chip);
         }
@@ -3858,20 +3858,20 @@ int __devinit snd_cs46xx_create(snd_card_t * card,
         for (idx = 0; idx < 5; idx++) {
                 region = &chip->region.idx[idx];
                 if ((region->resource = request_mem_region(region->base, region->size, region->name)) == NULL) {
-                        snd_printk("unable to request memory region 0x%lx-0x%lx\n", region->base, region->base + region->size - 1);
+                        snd_printk(KERN_ERR "unable to request memory region 0x%lx-0x%lx\n", region->base, region->base + region->size - 1);
                         snd_cs46xx_free(chip);
                         return -EBUSY;
                 }
                 region->remap_addr = ioremap_nocache(region->base, region->size);
                 if (region->remap_addr == NULL) {
-                        snd_printk("%s ioremap problem\n", region->name);
+                        snd_printk(KERN_ERR "%s ioremap problem\n", region->name);
                         snd_cs46xx_free(chip);
                         return -ENOMEM;
                 }
         }
 
         if (request_irq(pci->irq, snd_cs46xx_interrupt, SA_INTERRUPT|SA_SHIRQ, "CS46XX", (void *) chip)) {
-                snd_printk("unable to grab IRQ %d\n", pci->irq);
+                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_cs46xx_free(chip);
                 return -EBUSY;
         }
diff --git a/sound/pci/emu10k1/emu10k1.c b/sound/pci/emu10k1/emu10k1.c
index b0e00f0a7c2f..dd1ea9d3b81a 100644
--- a/sound/pci/emu10k1/emu10k1.c
+++ b/sound/pci/emu10k1/emu10k1.c
@@ -188,7 +188,7 @@ static int __devinit snd_card_emu10k1_probe(struct pci_dev *pci,
         if (snd_seq_device_new(card, 1, SNDRV_SEQ_DEV_ID_EMU10K1_SYNTH,
                                sizeof(snd_emu10k1_synth_arg_t), &wave) < 0 ||
             wave == NULL) {
-                snd_printk("can't initialize Emu10k1 wavetable synth\n");
+                snd_printk(KERN_WARNING "can't initialize Emu10k1 wavetable synth\n");
         } else {
                 snd_emu10k1_synth_arg_t *arg;
                 arg = SNDRV_SEQ_DEVICE_ARGPTR(wave);
diff --git a/sound/pci/emu10k1/emufx.c b/sound/pci/emu10k1/emufx.c
index 177c4ad0f778..03e8c1678952 100644
--- a/sound/pci/emu10k1/emufx.c
+++ b/sound/pci/emu10k1/emufx.c
@@ -1392,7 +1392,7 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input))
                 A_SWITCH(icode, &ptr, tmp + 1, playback + SND_EMU10K1_PLAYBACK_CHANNELS + z, tmp + 1);
                 if ((z==1) && (emu->card_capabilities->spdif_bug)) {
                         /* Due to a SPDIF output bug on some Audigy cards, this code delays the Right channel by 1 sample */
-                        snd_printk("Installing spdif_bug patch: %s\n", emu->card_capabilities->name);
+                        snd_printk(KERN_INFO "Installing spdif_bug patch: %s\n", emu->card_capabilities->name);
                         A_OP(icode, &ptr, iACC3, A_EXTOUT(A_EXTOUT_FRONT_L + z), A_GPR(gpr - 3), A_C_00000000, A_C_00000000);
                         A_OP(icode, &ptr, iACC3, A_GPR(gpr - 3), A_GPR(tmp + 0), A_GPR(tmp + 1), A_C_00000000);
                 } else {
diff --git a/sound/pci/emu10k1/irq.c b/sound/pci/emu10k1/irq.c
index cd8460d56752..594ea063b140 100644
--- a/sound/pci/emu10k1/irq.c
+++ b/sound/pci/emu10k1/irq.c
@@ -41,7 +41,7 @@ irqreturn_t snd_emu10k1_interrupt(int irq, void *dev_id, struct pt_regs *regs)
                 orig_status = status;
                 handled = 1;
                 if (status & IPR_PCIERROR) {
-                        snd_printk("interrupt: PCI error\n");
+                        snd_printk(KERN_ERR "interrupt: PCI error\n");
                         snd_emu10k1_intr_disable(emu, INTE_PCIERRORENABLE);
                         status &= ~IPR_PCIERROR;
                 }
diff --git a/sound/pci/emu10k1/memory.c b/sound/pci/emu10k1/memory.c
index 6afeaeab3e13..d42e4aeaa73a 100644
--- a/sound/pci/emu10k1/memory.c
+++ b/sound/pci/emu10k1/memory.c
@@ -232,11 +232,11 @@ __found_pages:
 static int is_valid_page(emu10k1_t *emu, dma_addr_t addr)
 {
         if (addr & ~emu->dma_mask) {
-                snd_printk("max memory size is 0x%lx (addr = 0x%lx)!!\n", emu->dma_mask, (unsigned long)addr);
+                snd_printk(KERN_ERR "max memory size is 0x%lx (addr = 0x%lx)!!\n", emu->dma_mask, (unsigned long)addr);
                 return 0;
         }
         if (addr & (EMUPAGESIZE-1)) {
-                snd_printk("page is not aligned\n");
+                snd_printk(KERN_ERR "page is not aligned\n");
                 return 0;
         }
         return 1;
@@ -501,7 +501,7 @@ static inline void *offset_ptr(emu10k1_t *emu, int page, int offset)
         snd_assert(page >= 0 && page < emu->max_cache_pages, return NULL);
         ptr = emu->page_ptr_table[page];
         if (! ptr) {
-                printk("emu10k1: access to NULL ptr: page = %d\n", page);
+                printk(KERN_ERR "emu10k1: access to NULL ptr: page = %d\n", page);
                 return NULL;
         }
         ptr += offset & (PAGE_SIZE - 1);
diff --git a/sound/pci/emu10k1/p16v.c b/sound/pci/emu10k1/p16v.c
index d59c7f345ad6..e27ebb9bb74a 100644
--- a/sound/pci/emu10k1/p16v.c
+++ b/sound/pci/emu10k1/p16v.c
@@ -546,7 +546,7 @@ snd_p16v_pcm_pointer_capture(snd_pcm_substream_t *substream)
         ptr=ptr2;
         if (ptr >= runtime->buffer_size) {
                 ptr -= runtime->buffer_size;
-                printk("buffer capture limited!\n");
+                printk(KERN_WARNING "buffer capture limited!\n");
         }
         //printk("ptr1 = 0x%lx, ptr2=0x%lx, ptr=0x%lx, buffer_size = 0x%x, period_size = 0x%x, bits=%d, rate=%d\n", ptr1, ptr2, ptr, (int)runtime->buffer_size, (int)runtime->period_size, (int)runtime->frame_bits, (int)runtime->rate);
 
diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c
index bef9a59f46d7..b4d0a9c2b0b5 100644
--- a/sound/pci/ens1370.c
+++ b/sound/pci/ens1370.c
@@ -508,7 +508,7 @@ static unsigned int snd_es1371_wait_src_ready(ensoniq_t * ensoniq)
                         return r;
                 cond_resched();
         }
-        snd_printk("wait source ready timeout 0x%lx [0x%x]\n", ES_REG(ensoniq, 1371_SMPRATE), r);
+        snd_printk(KERN_ERR "wait source ready timeout 0x%lx [0x%x]\n", ES_REG(ensoniq, 1371_SMPRATE), r);
         return 0;
 }
 
@@ -579,7 +579,7 @@ static void snd_es1370_codec_write(ak4531_t *ak4531,
                 set_current_state(TASK_UNINTERRUPTIBLE);
                 schedule_timeout(1);
         } while (time_after(end_time, jiffies));
-        snd_printk("codec write timeout, status = 0x%x\n", inl(ES_REG(ensoniq, STATUS)));
+        snd_printk(KERN_ERR "codec write timeout, status = 0x%x\n", inl(ES_REG(ensoniq, STATUS)));
 }
 
 #endif /* CHIP1370 */
@@ -620,7 +620,7 @@ static void snd_es1371_codec_write(ac97_t *ac97,
                 }
         }
         up(&ensoniq->src_mutex);
-        snd_printk("codec write timeout at 0x%lx [0x%x]\n", ES_REG(ensoniq, 1371_CODEC), inl(ES_REG(ensoniq, 1371_CODEC)));
+        snd_printk(KERN_ERR "codec write timeout at 0x%lx [0x%x]\n", ES_REG(ensoniq, 1371_CODEC), inl(ES_REG(ensoniq, 1371_CODEC)));
 }
 
 static unsigned short snd_es1371_codec_read(ac97_t *ac97,
@@ -667,14 +667,14 @@ static unsigned short snd_es1371_codec_read(ac97_t *ac97,
                         }
                         up(&ensoniq->src_mutex);
                         if (++fail > 10) {
-                                snd_printk("codec read timeout (final) at 0x%lx, reg = 0x%x [0x%x]\n", ES_REG(ensoniq, 1371_CODEC), reg, inl(ES_REG(ensoniq, 1371_CODEC)));
+                                snd_printk(KERN_ERR "codec read timeout (final) at 0x%lx, reg = 0x%x [0x%x]\n", ES_REG(ensoniq, 1371_CODEC), reg, inl(ES_REG(ensoniq, 1371_CODEC)));
                                 return 0;
                         }
                         goto __again;
                 }
         }
         up(&ensoniq->src_mutex);
-        snd_printk("es1371: codec read timeout at 0x%lx [0x%x]\n", ES_REG(ensoniq, 1371_CODEC), inl(ES_REG(ensoniq, 1371_CODEC)));
+        snd_printk(KERN_ERR "es1371: codec read timeout at 0x%lx [0x%x]\n", ES_REG(ensoniq, 1371_CODEC), inl(ES_REG(ensoniq, 1371_CODEC)));
         return 0;
 }
 
@@ -1960,7 +1960,7 @@ static int __devinit snd_ensoniq_create(snd_card_t * card,
         }
         ensoniq->port = pci_resource_start(pci, 0);
         if (request_irq(pci->irq, snd_audiopci_interrupt, SA_INTERRUPT|SA_SHIRQ, "Ensoniq AudioPCI", (void *)ensoniq)) {
-                snd_printk("unable to grab IRQ %d\n", pci->irq);
+                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_ensoniq_free(ensoniq);
                 return -EBUSY;
         }
@@ -1968,7 +1968,7 @@ static int __devinit snd_ensoniq_create(snd_card_t * card,
 #ifdef CHIP1370
         if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),
                                 16, &ensoniq->dma_bug) < 0) {
-                snd_printk("unable to allocate space for phantom area - dma_bug\n");
+                snd_printk(KERN_ERR "unable to allocate space for phantom area - dma_bug\n");
                 snd_ensoniq_free(ensoniq);
                 return -EBUSY;
         }
diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c
index 7bfbdfc2f8bc..78f90defcab1 100644
--- a/sound/pci/es1938.c
+++ b/sound/pci/es1938.c
@@ -267,7 +267,7 @@ static void snd_es1938_mixer_write(es1938_t *chip, unsigned char reg, unsigned c
         outb(val, SLSB_REG(chip, MIXERDATA));
         spin_unlock_irqrestore(&chip->mixer_lock, flags);
 #ifdef REG_DEBUG
-        snd_printk("Mixer reg %02x set to %02x\n", reg, val);
+        snd_printk(KERN_DEBUG "Mixer reg %02x set to %02x\n", reg, val);
 #endif
 }
 
@@ -283,7 +283,7 @@ static int snd_es1938_mixer_read(es1938_t *chip, unsigned char reg)
         data = inb(SLSB_REG(chip, MIXERDATA));
         spin_unlock_irqrestore(&chip->mixer_lock, flags);
 #ifdef REG_DEBUG
-        snd_printk("Mixer reg %02x now is %02x\n", reg, data);
+        snd_printk(KERN_DEBUG "Mixer reg %02x now is %02x\n", reg, data);
 #endif
         return data;
 }
@@ -303,7 +303,8 @@ static int snd_es1938_mixer_bits(es1938_t *chip, unsigned char reg, unsigned cha
                 new = (old & ~mask) | (val & mask);
                 outb(new, SLSB_REG(chip, MIXERDATA));
 #ifdef REG_DEBUG
-                snd_printk("Mixer reg %02x was %02x, set to %02x\n", reg, old, new);
+                snd_printk(KERN_DEBUG "Mixer reg %02x was %02x, set to %02x\n",
+                           reg, old, new);
 #endif
         }
         spin_unlock_irqrestore(&chip->mixer_lock, flags);
@@ -323,7 +324,7 @@ static void snd_es1938_write_cmd(es1938_t *chip, unsigned char cmd)
                         return;
                 }
         }
-        printk("snd_es1938_write_cmd timeout (0x02%x/0x02%x)\n", cmd, v);
+        printk(KERN_ERR "snd_es1938_write_cmd timeout (0x02%x/0x02%x)\n", cmd, v);
 }
 
 /* -----------------------------------------------------------------
@@ -336,7 +337,7 @@ static int snd_es1938_get_byte(es1938_t *chip)
         for (i = GET_LOOP_TIMEOUT; i; i--)
                 if ((v = inb(SLSB_REG(chip, STATUS))) & 0x80)
                         return inb(SLSB_REG(chip, READDATA));
-        snd_printk("get_byte timeout: status 0x02%x\n", v);
+        snd_printk(KERN_ERR "get_byte timeout: status 0x02%x\n", v);
         return -ENODEV;
 }
 
@@ -351,7 +352,7 @@ static void snd_es1938_write(es1938_t *chip, unsigned char reg, unsigned char va
         snd_es1938_write_cmd(chip, val);
         spin_unlock_irqrestore(&chip->reg_lock, flags);
 #ifdef REG_DEBUG
-        snd_printk("Reg %02x set to %02x\n", reg, val);
+        snd_printk(KERN_DEBUG "Reg %02x set to %02x\n", reg, val);
 #endif
 }
 
@@ -368,7 +369,7 @@ static unsigned char snd_es1938_read(es1938_t *chip, unsigned char reg)
         val = snd_es1938_get_byte(chip);
         spin_unlock_irqrestore(&chip->reg_lock, flags);
 #ifdef REG_DEBUG
-        snd_printk("Reg %02x now is %02x\n", reg, val);
+        snd_printk(KERN_DEBUG "Reg %02x now is %02x\n", reg, val);
 #endif
         return val;
 }
@@ -390,7 +391,8 @@ static int snd_es1938_bits(es1938_t *chip, unsigned char reg, unsigned char mask
                 new = (old & ~mask) | (val & mask);
                 snd_es1938_write_cmd(chip, new);
 #ifdef REG_DEBUG
-                snd_printk("Reg %02x was %02x, set to %02x\n", reg, old, new);
+                snd_printk(KERN_DEBUG "Reg %02x was %02x, set to %02x\n",
+                           reg, old, new);
 #endif
         }
         spin_unlock_irqrestore(&chip->reg_lock, flags);
@@ -413,7 +415,7 @@ static void snd_es1938_reset(es1938_t *chip)
                                 goto __next;
                 }
         }
-        snd_printk("ESS Solo-1 reset failed\n");
+        snd_printk(KERN_ERR "ESS Solo-1 reset failed\n");
 
      __next:
         snd_es1938_write_cmd(chip, ESS_CMD_ENABLEEXT);
@@ -1499,7 +1501,7 @@ static int __devinit snd_es1938_create(snd_card_t * card,
         /* check, if we can restrict PCI DMA transfers to 24 bits */
         if (pci_set_dma_mask(pci, 0x00ffffff) < 0 ||
             pci_set_consistent_dma_mask(pci, 0x00ffffff) < 0) {
-                snd_printk("architecture does not support 24bit PCI busmaster DMA\n");
+                snd_printk(KERN_ERR "architecture does not support 24bit PCI busmaster DMA\n");
                 pci_disable_device(pci);
                 return -ENXIO;
         }
@@ -1524,13 +1526,13 @@ static int __devinit snd_es1938_create(snd_card_t * card,
         chip->mpu_port = pci_resource_start(pci, 3);
         chip->game_port = pci_resource_start(pci, 4);
         if (request_irq(pci->irq, snd_es1938_interrupt, SA_INTERRUPT|SA_SHIRQ, "ES1938", (void *)chip)) {
-                snd_printk("unable to grab IRQ %d\n", pci->irq);
+                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_es1938_free(chip);
                 return -EBUSY;
         }
         chip->irq = pci->irq;
 #ifdef ES1938_DDEBUG
-        snd_printk("create: io: 0x%lx, sb: 0x%lx, vc: 0x%lx, mpu: 0x%lx, game: 0x%lx\n",
+        snd_printk(KERN_DEBUG "create: io: 0x%lx, sb: 0x%lx, vc: 0x%lx, mpu: 0x%lx, game: 0x%lx\n",
                    chip->io_port, chip->sb_port, chip->vc_port, chip->mpu_port, chip->game_port);
 #endif
 
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c
index 1bf094b67469..ac8294e21cc1 100644
--- a/sound/pci/es1968.c
+++ b/sound/pci/es1968.c
@@ -1462,13 +1462,13 @@ snd_es1968_init_dmabuf(es1968_t *chip)
                                                    snd_dma_pci_data(chip->pci),
                                                    chip->total_bufsize, &chip->dma);
                 if (err < 0 || ! chip->dma.area) {
-                        snd_printk("es1968: can't allocate dma pages for size %d\n",
+                        snd_printk(KERN_ERR "es1968: can't allocate dma pages for size %d\n",
                                    chip->total_bufsize);
                         return -ENOMEM;
                 }
                 if ((chip->dma.addr + chip->dma.bytes - 1) & ~((1 << 28) - 1)) {
                         snd_dma_free_pages(&chip->dma);
-                        snd_printk("es1968: DMA buffer beyond 256MB.\n");
+                        snd_printk(KERN_ERR "es1968: DMA buffer beyond 256MB.\n");
                         return -ENOMEM;
                 }
         }
@@ -1741,11 +1741,11 @@ static void __devinit es1968_measure_clock(es1968_t *chip)
 
         /* search 2 APUs (although one apu is enough) */
         if ((apu = snd_es1968_alloc_apu_pair(chip, ESM_APU_PCM_PLAY)) < 0) {
-                snd_printk("Hmm, cannot find empty APU pair!?\n");
+                snd_printk(KERN_ERR "Hmm, cannot find empty APU pair!?\n");
                 return;
         }
         if ((memory = snd_es1968_new_memory(chip, CLOCK_MEASURE_BUFSIZE)) == NULL) {
-                snd_printk("cannot allocate dma buffer - using default clock %d\n", chip->clock);
+                snd_printk(KERN_ERR "cannot allocate dma buffer - using default clock %d\n", chip->clock);
                 snd_es1968_free_apu_pair(chip, apu);
                 return;
         }
@@ -1806,7 +1806,7 @@ static void __devinit es1968_measure_clock(es1968_t *chip)
         else
                 t += stop_time.tv_usec - start_time.tv_usec;
         if (t == 0) {
-                snd_printk("?? calculation error..\n");
+                snd_printk(KERN_ERR "?? calculation error..\n");
         } else {
                 offset *= 1000;
                 offset = (offset / t) * 1000 + ((offset % t) * 1000) / t;
@@ -2090,7 +2090,7 @@ static void snd_es1968_ac97_reset(es1968_t *chip)
         outw(inw(ioaddr + 0x3c) & 0xfffc, ioaddr + 0x3c);
 
 #if 0                           /* the loop here needs to be much better if we want it.. */
-        snd_printk("trying software reset\n");
+        snd_printk(KERN_INFO "trying software reset\n");
         /* try and do a software reset */
         outb(0x80 | 0x7c, ioaddr + 0x30);
         for (w = 0;; w++) {
@@ -2562,7 +2562,7 @@ static int __devinit snd_es1968_create(snd_card_t * card,
         /* check, if we can restrict PCI DMA transfers to 28 bits */
         if (pci_set_dma_mask(pci, 0x0fffffff) < 0 ||
             pci_set_consistent_dma_mask(pci, 0x0fffffff) < 0) {
-                snd_printk("architecture does not support 28bit PCI busmaster DMA\n");
+                snd_printk(KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n");
                 pci_disable_device(pci);
                 return -ENXIO;
         }
@@ -2597,7 +2597,7 @@ static int __devinit snd_es1968_create(snd_card_t * card,
         chip->io_port = pci_resource_start(pci, 0);
         if (request_irq(pci->irq, snd_es1968_interrupt, SA_INTERRUPT|SA_SHIRQ,
                         "ESS Maestro", (void*)chip)) {
-                snd_printk("unable to grab IRQ %d\n", pci->irq);
+                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_es1968_free(chip);
                 return -EBUSY;
         }
diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c
index e5cfa2a0c246..47dbe317069f 100644
--- a/sound/pci/fm801.c
+++ b/sound/pci/fm801.c
@@ -237,7 +237,7 @@ static void snd_fm801_codec_write(ac97_t *ac97,
                         goto ok1;
                 udelay(10);
         }
-        snd_printk("AC'97 interface is busy (1)\n");
+        snd_printk(KERN_ERR "AC'97 interface is busy (1)\n");
         return;
 
  ok1:
@@ -252,7 +252,7 @@ static void snd_fm801_codec_write(ac97_t *ac97,
                         return;
                 udelay(10);
         }
-        snd_printk("AC'97 interface #%d is busy (2)\n", ac97->num);
+        snd_printk(KERN_ERR "AC'97 interface #%d is busy (2)\n", ac97->num);
 }
 
 static unsigned short snd_fm801_codec_read(ac97_t *ac97, unsigned short reg)
@@ -268,7 +268,7 @@ static unsigned short snd_fm801_codec_read(ac97_t *ac97, unsigned short reg)
                         goto ok1;
                 udelay(10);
         }
-        snd_printk("AC'97 interface is busy (1)\n");
+        snd_printk(KERN_ERR "AC'97 interface is busy (1)\n");
         return 0;
 
  ok1:
@@ -279,7 +279,7 @@ static unsigned short snd_fm801_codec_read(ac97_t *ac97, unsigned short reg)
                         goto ok2;
                 udelay(10);
         }
-        snd_printk("AC'97 interface #%d is busy (2)\n", ac97->num);
+        snd_printk(KERN_ERR "AC'97 interface #%d is busy (2)\n", ac97->num);
         return 0;
 
  ok2:
@@ -288,7 +288,7 @@ static unsigned short snd_fm801_codec_read(ac97_t *ac97, unsigned short reg)
                         goto ok3;
                 udelay(10);
         }
-        snd_printk("AC'97 interface #%d is not valid (2)\n", ac97->num);
+        snd_printk(KERN_ERR "AC'97 interface #%d is not valid (2)\n", ac97->num);
         return 0;
 
  ok3:
@@ -1279,7 +1279,7 @@ static int __devinit snd_fm801_create(snd_card_t * card,
         }
         chip->port = pci_resource_start(pci, 0);
         if (request_irq(pci->irq, snd_fm801_interrupt, SA_INTERRUPT|SA_SHIRQ, "FM801", (void *)chip)) {
-                snd_printk("unable to grab IRQ %d\n", chip->irq);
+                snd_printk(KERN_ERR "unable to grab IRQ %d\n", chip->irq);
                 snd_fm801_free(chip);
                 return -EBUSY;
         }
@@ -1306,7 +1306,7 @@ static int __devinit snd_fm801_create(snd_card_t * card,
                 set_current_state(TASK_UNINTERRUPTIBLE);
                 schedule_timeout(1);
         } while (time_after(timeout, jiffies));
-        snd_printk("Primary AC'97 codec not found\n");
+        snd_printk(KERN_ERR "Primary AC'97 codec not found\n");
         snd_fm801_free(chip);
         return -EIO;
 
@@ -1346,7 +1346,7 @@ static int __devinit snd_fm801_create(snd_card_t * card,
                 set_current_state(TASK_UNINTERRUPTIBLE);
                 schedule_timeout(1);
         } while (time_after(timeout, jiffies));
-        snd_printk("Primary AC'97 codec not responding\n");
+        snd_printk(KERN_ERR "Primary AC'97 codec not responding\n");
         snd_fm801_free(chip);
         return -EIO;
 
diff --git a/sound/pci/ice1712/aureon.c b/sound/pci/ice1712/aureon.c
index 2e0a31613ee6..40b48186767e 100644
--- a/sound/pci/ice1712/aureon.c
+++ b/sound/pci/ice1712/aureon.c
@@ -1672,9 +1672,9 @@ static int __devinit aureon_add_controls(ice1712_t *ice)
                 snd_ice1712_save_gpio_status(ice);
                 id = aureon_cs8415_get(ice, CS8415_ID);
                 if (id != 0x41)
-                        snd_printk("No CS8415 chip. Skipping CS8415 controls.\n");
+                        snd_printk(KERN_INFO "No CS8415 chip. Skipping CS8415 controls.\n");
                 else if ((id & 0x0F) != 0x01)
-                        snd_printk("Detected unsupported CS8415 rev. (%c)\n", (char)((id & 0x0F) + 'A' - 1));
+                        snd_printk(KERN_INFO "Detected unsupported CS8415 rev. (%c)\n", (char)((id & 0x0F) + 'A' - 1));
                 else {
                         for (i = 0; i< ARRAY_SIZE(cs8415_controls); i++) {
                                 snd_kcontrol_t *kctl;
diff --git a/sound/pci/ice1712/delta.c b/sound/pci/ice1712/delta.c
index 39fbe662965d..576f69d482c9 100644
--- a/sound/pci/ice1712/delta.c
+++ b/sound/pci/ice1712/delta.c
@@ -546,7 +546,7 @@ static int __devinit snd_ice1712_delta_init(ice1712_t *ice)
         case ICE1712_SUBDEVICE_DELTA1010LT:
         case ICE1712_SUBDEVICE_VX442:
                 if ((err = snd_i2c_bus_create(ice->card, "ICE1712 GPIO 1", NULL, &ice->i2c)) < 0) {
-                        snd_printk("unable to create I2C bus\n");
+                        snd_printk(KERN_ERR "unable to create I2C bus\n");
                         return err;
                 }
                 ice->i2c->private_data = ice;
diff --git a/sound/pci/ice1712/ews.c b/sound/pci/ice1712/ews.c
index e36efa1bdac3..c8ec5cac3c17 100644
--- a/sound/pci/ice1712/ews.c
+++ b/sound/pci/ice1712/ews.c
@@ -438,7 +438,7 @@ static int __devinit snd_ice1712_ews_init(ice1712_t *ice)
 
         /* create i2c */
         if ((err = snd_i2c_bus_create(ice->card, "ICE1712 GPIO 1", NULL, &ice->i2c)) < 0) {
-                snd_printk("unable to create I2C bus\n");
+                snd_printk(KERN_ERR "unable to create I2C bus\n");
                 return err;
         }
         ice->i2c->private_data = ice;
@@ -448,7 +448,7 @@ static int __devinit snd_ice1712_ews_init(ice1712_t *ice)
         switch (ice->eeprom.subvendor) {
         case ICE1712_SUBDEVICE_DMX6FIRE:
                 if ((err = snd_i2c_device_create(ice->i2c, "PCF9554", ICE1712_6FIRE_PCF9554_ADDR, &ice->spec.i2cdevs[EWS_I2C_6FIRE])) < 0) {
-                        snd_printk("PCF9554 initialization failed\n");
+                        snd_printk(KERN_ERR "PCF9554 initialization failed\n");
                         return err;
                 }
                 snd_ice1712_6fire_write_pca(ice, PCF9554_REG_CONFIG, 0x80);
@@ -791,7 +791,7 @@ static int snd_ice1712_6fire_read_pca(ice1712_t *ice, unsigned char reg)
         byte = 0;
         if (snd_i2c_readbytes(ice->spec.i2cdevs[EWS_I2C_6FIRE], &byte, 1) != 1) {
                 snd_i2c_unlock(ice->i2c);
-                printk("cannot read pca\n");
+                printk(KERN_ERR "cannot read pca\n");
                 return -EIO;
         }
         snd_i2c_unlock(ice->i2c);
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c
index a6d98013c331..5aca37798c32 100644
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
@@ -387,7 +387,7 @@ int __devinit snd_ice1712_init_cs8427(ice1712_t *ice, int addr)
         if ((err = snd_cs8427_create(ice->i2c, addr,
                                      (ice->cs8427_timeout * HZ) / 1000,
                                      &ice->cs8427)) < 0) {
-                snd_printk("CS8427 initialization failed\n");
+                snd_printk(KERN_ERR "CS8427 initialization failed\n");
                 return err;
         }
         ice->spdif.ops.open = open_cs8427;
@@ -2348,12 +2348,12 @@ static int __devinit snd_ice1712_read_eeprom(ice1712_t *ice, const char *modelna
         if (ice->eeprom.size < 6)
                 ice->eeprom.size = 32; /* FIXME: any cards without the correct size? */
         else if (ice->eeprom.size > 32) {
-                snd_printk("invalid EEPROM (size = %i)\n", ice->eeprom.size);
+                snd_printk(KERN_ERR "invalid EEPROM (size = %i)\n", ice->eeprom.size);
                 return -EIO;
         }
         ice->eeprom.version = snd_ice1712_read_i2c(ice, dev, 0x05);
         if (ice->eeprom.version != 1) {
-                snd_printk("invalid EEPROM version %i\n", ice->eeprom.version);
+                snd_printk(KERN_ERR "invalid EEPROM version %i\n", ice->eeprom.version);
                 /* return -EIO; */
         }
         size = ice->eeprom.size - 6;
@@ -2524,7 +2524,7 @@ static int __devinit snd_ice1712_create(snd_card_t * card,
         /* check, if we can restrict PCI DMA transfers to 28 bits */
         if (pci_set_dma_mask(pci, 0x0fffffff) < 0 ||
             pci_set_consistent_dma_mask(pci, 0x0fffffff) < 0) {
-                snd_printk("architecture does not support 28bit PCI busmaster DMA\n");
+                snd_printk(KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n");
                 pci_disable_device(pci);
                 return -ENXIO;
         }
@@ -2573,7 +2573,7 @@ static int __devinit snd_ice1712_create(snd_card_t * card,
         ice->profi_port = pci_resource_start(pci, 3);
 
         if (request_irq(pci->irq, snd_ice1712_interrupt, SA_INTERRUPT|SA_SHIRQ, "ICE1712", (void *) ice)) {
-                snd_printk("unable to grab IRQ %d\n", pci->irq);
+                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_ice1712_free(ice);
                 return -EIO;
         }
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c
index a1133c53412f..5b4293f5a652 100644
--- a/sound/pci/ice1712/ice1724.c
+++ b/sound/pci/ice1712/ice1724.c
@@ -2171,7 +2171,7 @@ static int __devinit snd_vt1724_create(snd_card_t * card,
         ice->profi_port = pci_resource_start(pci, 1);
 
         if (request_irq(pci->irq, snd_vt1724_interrupt, SA_INTERRUPT|SA_SHIRQ, "ICE1724", (void *) ice)) {
-                snd_printk("unable to grab IRQ %d\n", pci->irq);
+                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_vt1724_free(ice);
                 return -EIO;
         }
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index 68d0ed033d3a..d71f5d1e7169 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -538,7 +538,7 @@ static int snd_intel8x0_codec_semaphore(intel8x0_t *chip, unsigned int codec)
         /* access to some forbidden (non existant) ac97 registers will not
          * reset the semaphore. So even if you don't get the semaphore, still
          * continue the access. We don't need the semaphore anyway. */
-        snd_printk("codec_semaphore: semaphore is not ready [0x%x][0x%x]\n",
+        snd_printk(KERN_ERR "codec_semaphore: semaphore is not ready [0x%x][0x%x]\n",
                         igetbyte(chip, ICHREG(ACC_SEMA)), igetdword(chip, ICHREG(GLOB_STA)));
         iagetword(chip, 0);     /* clear semaphore flag */
         /* I don't care about the semaphore */
@@ -553,7 +553,7 @@ static void snd_intel8x0_codec_write(ac97_t *ac97,
         
         if (snd_intel8x0_codec_semaphore(chip, ac97->num) < 0) {
                 if (! chip->in_ac97_init)
-                        snd_printk("codec_write %d: semaphore is not ready for register 0x%x\n", ac97->num, reg);
+                        snd_printk(KERN_ERR "codec_write %d: semaphore is not ready for register 0x%x\n", ac97->num, reg);
         }
         iaputword(chip, reg + ac97->num * 0x80, val);
 }
@@ -567,7 +567,7 @@ static unsigned short snd_intel8x0_codec_read(ac97_t *ac97,
 
         if (snd_intel8x0_codec_semaphore(chip, ac97->num) < 0) {
                 if (! chip->in_ac97_init)
-                        snd_printk("codec_read %d: semaphore is not ready for register 0x%x\n", ac97->num, reg);
+                        snd_printk(KERN_ERR "codec_read %d: semaphore is not ready for register 0x%x\n", ac97->num, reg);
                 res = 0xffff;
         } else {
                 res = iagetword(chip, reg + ac97->num * 0x80);
@@ -575,7 +575,7 @@ static unsigned short snd_intel8x0_codec_read(ac97_t *ac97,
                         /* reset RCS and preserve other R/WC bits */
                         iputdword(chip, ICHREG(GLOB_STA), tmp & ~(ICH_SRI|ICH_PRI|ICH_TRI|ICH_GSCI));
                         if (! chip->in_ac97_init)
-                                snd_printk("codec_read %d: read timeout for register 0x%x\n", ac97->num, reg);
+                                snd_printk(KERN_ERR "codec_read %d: read timeout for register 0x%x\n", ac97->num, reg);
                         res = 0xffff;
                 }
         }
@@ -2173,7 +2173,7 @@ static int snd_intel8x0_ich_chip_init(intel8x0_t *chip, int probing)
                         goto __ok;
                 do_delay(chip);
         } while (time_after_eq(end_time, jiffies));
-        snd_printk("AC'97 warm reset still in progress? [0x%x]\n", igetdword(chip, ICHREG(GLOB_CNT)));
+        snd_printk(KERN_ERR "AC'97 warm reset still in progress? [0x%x]\n", igetdword(chip, ICHREG(GLOB_CNT)));
         return -EIO;
 
       __ok:
@@ -2448,7 +2448,7 @@ static void __devinit intel8x0_measure_ac97_clock(intel8x0_t *chip)
 
         subs = chip->pcm[0]->streams[0].substream;
         if (! subs || subs->dma_buffer.bytes < INTEL8X0_TESTBUF_SIZE) {
-                snd_printk("no playback buffer allocated - aborting measure ac97 clock\n");
+                snd_printk(KERN_WARNING "no playback buffer allocated - aborting measure ac97 clock\n");
                 return;
         }
         ichdev = &chip->ichd[ICHD_PCMOUT];
@@ -2655,7 +2655,7 @@ static int __devinit snd_intel8x0_create(snd_card_t * card,
                 chip->remap_addr = ioremap_nocache(chip->addr,
                                                    pci_resource_len(pci, 2));
                 if (chip->remap_addr == NULL) {
-                        snd_printk("AC'97 space ioremap problem\n");
+                        snd_printk(KERN_ERR "AC'97 space ioremap problem\n");
                         snd_intel8x0_free(chip);
                         return -EIO;
                 }
@@ -2668,7 +2668,7 @@ static int __devinit snd_intel8x0_create(snd_card_t * card,
                 chip->remap_bmaddr = ioremap_nocache(chip->bmaddr,
                                                      pci_resource_len(pci, 3));
                 if (chip->remap_bmaddr == NULL) {
-                        snd_printk("Controller space ioremap problem\n");
+                        snd_printk(KERN_ERR "Controller space ioremap problem\n");
                         snd_intel8x0_free(chip);
                         return -EIO;
                 }
@@ -2678,7 +2678,7 @@ static int __devinit snd_intel8x0_create(snd_card_t * card,
 
  port_inited:
         if (request_irq(pci->irq, snd_intel8x0_interrupt, SA_INTERRUPT|SA_SHIRQ, card->shortname, (void *)chip)) {
-                snd_printk("unable to grab IRQ %d\n", pci->irq);
+                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_intel8x0_free(chip);
                 return -EBUSY;
         }
diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c
index 42601f0e6a57..49a9f4d08963 100644
--- a/sound/pci/intel8x0m.c
+++ b/sound/pci/intel8x0m.c
@@ -363,7 +363,7 @@ static int snd_intel8x0m_codec_semaphore(intel8x0_t *chip, unsigned int codec)
         /* access to some forbidden (non existant) ac97 registers will not
          * reset the semaphore. So even if you don't get the semaphore, still
          * continue the access. We don't need the semaphore anyway. */
-        snd_printk("codec_semaphore: semaphore is not ready [0x%x][0x%x]\n",
+        snd_printk(KERN_ERR "codec_semaphore: semaphore is not ready [0x%x][0x%x]\n",
                         igetbyte(chip, ICHREG(ACC_SEMA)), igetdword(chip, ICHREG(GLOB_STA)));
         iagetword(chip, 0);     /* clear semaphore flag */
         /* I don't care about the semaphore */
@@ -378,7 +378,7 @@ static void snd_intel8x0_codec_write(ac97_t *ac97,
         
         if (snd_intel8x0m_codec_semaphore(chip, ac97->num) < 0) {
                 if (! chip->in_ac97_init)
-                        snd_printk("codec_write %d: semaphore is not ready for register 0x%x\n", ac97->num, reg);
+                        snd_printk(KERN_ERR "codec_write %d: semaphore is not ready for register 0x%x\n", ac97->num, reg);
         }
         iaputword(chip, reg + ac97->num * 0x80, val);
 }
@@ -392,7 +392,7 @@ static unsigned short snd_intel8x0_codec_read(ac97_t *ac97,
 
         if (snd_intel8x0m_codec_semaphore(chip, ac97->num) < 0) {
                 if (! chip->in_ac97_init)
-                        snd_printk("codec_read %d: semaphore is not ready for register 0x%x\n", ac97->num, reg);
+                        snd_printk(KERN_ERR "codec_read %d: semaphore is not ready for register 0x%x\n", ac97->num, reg);
                 res = 0xffff;
         } else {
                 res = iagetword(chip, reg + ac97->num * 0x80);
@@ -400,7 +400,7 @@ static unsigned short snd_intel8x0_codec_read(ac97_t *ac97,
                         /* reset RCS and preserve other R/WC bits */
                         iputdword(chip, ICHREG(GLOB_STA), tmp & ~(ICH_SRI|ICH_PRI|ICH_TRI|ICH_GSCI));
                         if (! chip->in_ac97_init)
-                                snd_printk("codec_read %d: read timeout for register 0x%x\n", ac97->num, reg);
+                                snd_printk(KERN_ERR "codec_read %d: read timeout for register 0x%x\n", ac97->num, reg);
                         res = 0xffff;
                 }
         }
@@ -917,7 +917,7 @@ static int snd_intel8x0m_ich_chip_init(intel8x0_t *chip, int probing)
                         goto __ok;
                 do_delay(chip);
         } while (time_after_eq(end_time, jiffies));
-        snd_printk("AC'97 warm reset still in progress? [0x%x]\n", igetdword(chip, ICHREG(GLOB_CNT)));
+        snd_printk(KERN_ERR "AC'97 warm reset still in progress? [0x%x]\n", igetdword(chip, ICHREG(GLOB_CNT)));
         return -EIO;
 
       __ok:
@@ -1143,7 +1143,7 @@ static int __devinit snd_intel8x0m_create(snd_card_t * card,
                 chip->remap_addr = ioremap_nocache(chip->addr,
                                                    pci_resource_len(pci, 2));
                 if (chip->remap_addr == NULL) {
-                        snd_printk("AC'97 space ioremap problem\n");
+                        snd_printk(KERN_ERR "AC'97 space ioremap problem\n");
                         snd_intel8x0_free(chip);
                         return -EIO;
                 }
@@ -1156,7 +1156,7 @@ static int __devinit snd_intel8x0m_create(snd_card_t * card,
                 chip->remap_bmaddr = ioremap_nocache(chip->bmaddr,
                                                      pci_resource_len(pci, 3));
                 if (chip->remap_bmaddr == NULL) {
-                        snd_printk("Controller space ioremap problem\n");
+                        snd_printk(KERN_ERR "Controller space ioremap problem\n");
                         snd_intel8x0_free(chip);
                         return -EIO;
                 }
@@ -1166,7 +1166,7 @@ static int __devinit snd_intel8x0m_create(snd_card_t * card,
 
  port_inited:
         if (request_irq(pci->irq, snd_intel8x0_interrupt, SA_INTERRUPT|SA_SHIRQ, card->shortname, (void *)chip)) {
-                snd_printk("unable to grab IRQ %d\n", pci->irq);
+                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_intel8x0_free(chip);
                 return -EBUSY;
         }
diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c
index 7b1b82521cf4..ad77b4145824 100644
--- a/sound/pci/maestro3.c
+++ b/sound/pci/maestro3.c
@@ -1492,7 +1492,7 @@ static int snd_m3_pcm_hw_params(snd_pcm_substream_t * substream,
         /* set buffer address */
         s->buffer_addr = substream->runtime->dma_addr;
         if (s->buffer_addr & 0x3) {
-                snd_printk("oh my, not aligned\n");
+                snd_printk(KERN_ERR "oh my, not aligned\n");
                 s->buffer_addr = s->buffer_addr & ~0x3;
         }
         return 0;
@@ -1942,7 +1942,7 @@ static int snd_m3_ac97_wait(m3_t *chip)
                         return 0;
         } while (i-- > 0);
 
-        snd_printk("ac97 serial bus busy\n");
+        snd_printk(KERN_ERR "ac97 serial bus busy\n");
         return 1;
 }
 
@@ -2367,7 +2367,7 @@ static int __devinit snd_m3_assp_client_init(m3_t *chip, m3_dma_t *s, int index)
         address = 0x1100 + ((data_bytes/2) * index);
 
         if ((address + (data_bytes/2)) >= 0x1c00) {
-                snd_printk("no memory for %d bytes at ind %d (addr 0x%x)\n",
+                snd_printk(KERN_ERR "no memory for %d bytes at ind %d (addr 0x%x)\n",
                            data_bytes, index, address);
                 return -ENOMEM;
         }
@@ -2656,7 +2656,7 @@ snd_m3_create(snd_card_t *card, struct pci_dev *pci,
         /* check, if we can restrict PCI DMA transfers to 28 bits */
         if (pci_set_dma_mask(pci, 0x0fffffff) < 0 ||
             pci_set_consistent_dma_mask(pci, 0x0fffffff) < 0) {
-                snd_printk("architecture does not support 28bit PCI busmaster DMA\n");
+                snd_printk(KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n");
                 pci_disable_device(pci);
                 return -ENXIO;
         }
@@ -2741,7 +2741,7 @@ snd_m3_create(snd_card_t *card, struct pci_dev *pci,
 
         if (request_irq(pci->irq, snd_m3_interrupt, SA_INTERRUPT|SA_SHIRQ,
                         card->driver, (void *)chip)) {
-                snd_printk("unable to grab IRQ %d\n", pci->irq);
+                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_m3_free(chip);
                 return -ENOMEM;
         }
diff --git a/sound/pci/nm256/nm256.c b/sound/pci/nm256/nm256.c
index cccdc576b8a3..e7aa15178453 100644
--- a/sound/pci/nm256/nm256.c
+++ b/sound/pci/nm256/nm256.c
@@ -320,9 +320,9 @@ static inline void
 snd_nm256_write_buffer(nm256_t *chip, void *src, int offset, int size)
 {
         offset -= chip->buffer_start;
-#ifdef SNDRV_CONFIG_DEBUG
+#ifdef CONFIG_SND_DEBUG
         if (offset < 0 || offset >= chip->buffer_size) {
-                snd_printk("write_buffer invalid offset = %d size = %d\n", offset, size);
+                snd_printk(KERN_ERR "write_buffer invalid offset = %d size = %d\n", offset, size);
                 return;
         }
 #endif
@@ -466,7 +466,7 @@ static int snd_nm256_acquire_irq(nm256_t *chip)
         if (chip->irq < 0) {
                 if (request_irq(chip->pci->irq, chip->interrupt, SA_INTERRUPT|SA_SHIRQ,
                                 chip->card->driver, (void*)chip)) {
-                        snd_printk("unable to grab IRQ %d\n", chip->pci->irq);
+                        snd_printk(KERN_ERR "unable to grab IRQ %d\n", chip->pci->irq);
                         up(&chip->irq_mutex);
                         return -EBUSY;
                 }
@@ -1273,7 +1273,7 @@ snd_nm256_peek_for_sig(nm256_t *chip)
 
         temp = ioremap_nocache(chip->buffer_addr + chip->buffer_end - 0x400, 16);
         if (temp == NULL) {
-                snd_printk("Unable to scan for card signature in video RAM\n");
+                snd_printk(KERN_ERR "Unable to scan for card signature in video RAM\n");
                 return -EBUSY;
         }
 
@@ -1287,7 +1287,7 @@ snd_nm256_peek_for_sig(nm256_t *chip)
                 if (pointer == 0xffffffff ||
                     pointer < chip->buffer_size ||
                     pointer > chip->buffer_end) {
-                        snd_printk("invalid signature found: 0x%x\n", pointer);
+                        snd_printk(KERN_ERR "invalid signature found: 0x%x\n", pointer);
                         iounmap(temp);
                         return -ENODEV;
                 } else {
@@ -1424,14 +1424,14 @@ snd_nm256_create(snd_card_t *card, struct pci_dev *pci,
         chip->res_cport = request_mem_region(chip->cport_addr, NM_PORT2_SIZE,
                                              card->driver);
         if (chip->res_cport == NULL) {
-                snd_printk("memory region 0x%lx (size 0x%x) busy\n",
+                snd_printk(KERN_ERR "memory region 0x%lx (size 0x%x) busy\n",
                            chip->cport_addr, NM_PORT2_SIZE);
                 err = -EBUSY;
                 goto __error;
         }
         chip->cport = ioremap_nocache(chip->cport_addr, NM_PORT2_SIZE);
         if (chip->cport == NULL) {
-                snd_printk("unable to map control port %lx\n", chip->cport_addr);
+                snd_printk(KERN_ERR "unable to map control port %lx\n", chip->cport_addr);
                 err = -ENOMEM;
                 goto __error;
         }
@@ -1489,7 +1489,7 @@ snd_nm256_create(snd_card_t *card, struct pci_dev *pci,
                                               chip->buffer_size,
                                               card->driver);
         if (chip->res_buffer == NULL) {
-                snd_printk("nm256: buffer 0x%lx (size 0x%x) busy\n",
+                snd_printk(KERN_ERR "nm256: buffer 0x%lx (size 0x%x) busy\n",
                            chip->buffer_addr, chip->buffer_size);
                 err = -EBUSY;
                 goto __error;
@@ -1497,7 +1497,7 @@ snd_nm256_create(snd_card_t *card, struct pci_dev *pci,
         chip->buffer = ioremap_nocache(chip->buffer_addr, chip->buffer_size);
         if (chip->buffer == NULL) {
                 err = -ENOMEM;
-                snd_printk("unable to map ring buffer at %lx\n", chip->buffer_addr);
+                snd_printk(KERN_ERR "unable to map ring buffer at %lx\n", chip->buffer_addr);
                 goto __error;
         }
 
@@ -1605,7 +1605,7 @@ static int __devinit snd_nm256_probe(struct pci_dev *pci,
                 strcpy(card->driver, "NM256XL+");
                 break;
         default:
-                snd_printk("invalid device id 0x%x\n", pci->device);
+                snd_printk(KERN_ERR "invalid device id 0x%x\n", pci->device);
                 snd_card_free(card);
                 return -EINVAL;
         }
diff --git a/sound/pci/rme32.c b/sound/pci/rme32.c
index cd313af6ebcf..e6627b0e38e4 100644
--- a/sound/pci/rme32.c
+++ b/sound/pci/rme32.c
@@ -1369,13 +1369,13 @@ static int __devinit snd_rme32_create(rme32_t * rme32)
         rme32->port = pci_resource_start(rme32->pci, 0);
 
         if (request_irq(pci->irq, snd_rme32_interrupt, SA_INTERRUPT | SA_SHIRQ, "RME32", (void *) rme32)) {
-                snd_printk("unable to grab IRQ %d\n", pci->irq);
+                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 return -EBUSY;
         }
         rme32->irq = pci->irq;
 
         if ((rme32->iobase = ioremap_nocache(rme32->port, RME32_IO_SIZE)) == 0) {
-                snd_printk("unable to remap memory region 0x%lx-0x%lx\n",
+                snd_printk(KERN_ERR "unable to remap memory region 0x%lx-0x%lx\n",
                            rme32->port, rme32->port + RME32_IO_SIZE - 1);
                 return -ENOMEM;
         }
diff --git a/sound/pci/rme96.c b/sound/pci/rme96.c
index c495cae78dbf..0eddeb16a10f 100644
--- a/sound/pci/rme96.c
+++ b/sound/pci/rme96.c
@@ -1570,13 +1570,13 @@ snd_rme96_create(rme96_t *rme96)
         rme96->port = pci_resource_start(rme96->pci, 0);
 
         if (request_irq(pci->irq, snd_rme96_interrupt, SA_INTERRUPT|SA_SHIRQ, "RME96", (void *)rme96)) {
-                snd_printk("unable to grab IRQ %d\n", pci->irq);
+                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 return -EBUSY;
         }
         rme96->irq = pci->irq;
 
         if ((rme96->iobase = ioremap_nocache(rme96->port, RME96_IO_SIZE)) == 0) {
-                snd_printk("unable to remap memory region 0x%lx-0x%lx\n", rme96->port, rme96->port + RME96_IO_SIZE - 1);
+                snd_printk(KERN_ERR "unable to remap memory region 0x%lx-0x%lx\n", rme96->port, rme96->port + RME96_IO_SIZE - 1);
                 return -ENOMEM;
         }
 
diff --git a/sound/pci/rme9652/rme9652.c b/sound/pci/rme9652/rme9652.c
index b600f45e1834..59fcef9b6b81 100644
--- a/sound/pci/rme9652/rme9652.c
+++ b/sound/pci/rme9652/rme9652.c
@@ -779,7 +779,7 @@ static inline int rme9652_spdif_sample_rate(rme9652_t *s)
                 break;
 
         default:
-                snd_printk("%s: unknown S/PDIF input rate (bits = 0x%x)\n",
+                snd_printk(KERN_ERR "%s: unknown S/PDIF input rate (bits = 0x%x)\n",
                            s->card_name, rate_bits);
                 return 0;
                 break;
@@ -2496,12 +2496,12 @@ static int __devinit snd_rme9652_create(snd_card_t *card,
         rme9652->port = pci_resource_start(pci, 0);
         rme9652->iobase = ioremap_nocache(rme9652->port, RME9652_IO_EXTENT);
         if (rme9652->iobase == NULL) {
-                snd_printk("unable to remap region 0x%lx-0x%lx\n", rme9652->port, rme9652->port + RME9652_IO_EXTENT - 1);
+                snd_printk(KERN_ERR "unable to remap region 0x%lx-0x%lx\n", rme9652->port, rme9652->port + RME9652_IO_EXTENT - 1);
                 return -EBUSY;
         }
         
         if (request_irq(pci->irq, snd_rme9652_interrupt, SA_INTERRUPT|SA_SHIRQ, "rme9652", (void *)rme9652)) {
-                snd_printk("unable to request IRQ %d\n", pci->irq);
+                snd_printk(KERN_ERR "unable to request IRQ %d\n", pci->irq);
                 return -EBUSY;
         }
         rme9652->irq = pci->irq;
diff --git a/sound/pci/sonicvibes.c b/sound/pci/sonicvibes.c
index 4f64814dfef0..9a35474aad05 100644
--- a/sound/pci/sonicvibes.c
+++ b/sound/pci/sonicvibes.c
@@ -591,7 +591,7 @@ static irqreturn_t snd_sonicvibes_interrupt(int irq, void *dev_id, struct pt_reg
                 return IRQ_NONE;
         if (status == 0xff) {   /* failure */
                 outb(sonic->irqmask = ~0, SV_REG(sonic, IRQMASK));
-                snd_printk("IRQ failure - interrupts disabled!!\n");
+                snd_printk(KERN_ERR "IRQ failure - interrupts disabled!!\n");
                 return IRQ_HANDLED;
         }
         if (sonic->pcm) {
@@ -1239,7 +1239,7 @@ static int __devinit snd_sonicvibes_create(snd_card_t * card,
         /* check, if we can restrict PCI DMA transfers to 24 bits */
         if (pci_set_dma_mask(pci, 0x00ffffff) < 0 ||
             pci_set_consistent_dma_mask(pci, 0x00ffffff) < 0) {
-                snd_printk("architecture does not support 24bit PCI busmaster DMA\n");
+                snd_printk(KERN_ERR "architecture does not support 24bit PCI busmaster DMA\n");
                 pci_disable_device(pci);
                 return -ENXIO;
         }
@@ -1267,7 +1267,7 @@ static int __devinit snd_sonicvibes_create(snd_card_t * card,
         sonic->game_port = pci_resource_start(pci, 4);
 
         if (request_irq(pci->irq, snd_sonicvibes_interrupt, SA_INTERRUPT|SA_SHIRQ, "S3 SonicVibes", (void *)sonic)) {
-                snd_printk("unable to grab IRQ %d\n", pci->irq);
+                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_sonicvibes_free(sonic);
                 return -EBUSY;
         }
@@ -1281,24 +1281,24 @@ static int __devinit snd_sonicvibes_create(snd_card_t * card,
         if (!dmaa) {
                 dmaa = dmaio;
                 dmaio += 0x10;
-                snd_printk("BIOS did not allocate DDMA channel A i/o, allocated at 0x%x\n", dmaa);
+                snd_printk(KERN_INFO "BIOS did not allocate DDMA channel A i/o, allocated at 0x%x\n", dmaa);
         }
         if (!dmac) {
                 dmac = dmaio;
                 dmaio += 0x10;
-                snd_printk("BIOS did not allocate DDMA channel C i/o, allocated at 0x%x\n", dmac);
+                snd_printk(KERN_INFO "BIOS did not allocate DDMA channel C i/o, allocated at 0x%x\n", dmac);
         }
         pci_write_config_dword(pci, 0x40, dmaa);
         pci_write_config_dword(pci, 0x48, dmac);
 
         if ((sonic->res_dmaa = request_region(dmaa, 0x10, "S3 SonicVibes DDMA-A")) == NULL) {
                 snd_sonicvibes_free(sonic);
-                snd_printk("unable to grab DDMA-A port at 0x%x-0x%x\n", dmaa, dmaa + 0x10 - 1);
+                snd_printk(KERN_ERR "unable to grab DDMA-A port at 0x%x-0x%x\n", dmaa, dmaa + 0x10 - 1);
                 return -EBUSY;
         }
         if ((sonic->res_dmac = request_region(dmac, 0x10, "S3 SonicVibes DDMA-C")) == NULL) {
                 snd_sonicvibes_free(sonic);
-                snd_printk("unable to grab DDMA-C port at 0x%x-0x%x\n", dmac, dmac + 0x10 - 1);
+                snd_printk(KERN_ERR "unable to grab DDMA-C port at 0x%x-0x%x\n", dmac, dmac + 0x10 - 1);
                 return -EBUSY;
         }
 
diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c
index dda62955b4fe..08226f523eb8 100644
--- a/sound/pci/trident/trident_main.c
+++ b/sound/pci/trident/trident_main.c
@@ -153,7 +153,7 @@ static unsigned short snd_trident_codec_read(ac97_t *ac97, unsigned short reg)
         }
 
         if (count == 0 && !trident->ac97_detect) {
-                snd_printk("ac97 codec read TIMEOUT [0x%x/0x%x]!!!\n", reg, data);
+                snd_printk(KERN_ERR "ac97 codec read TIMEOUT [0x%x/0x%x]!!!\n", reg, data);
                 data = 0;
         }
 
@@ -2990,13 +2990,13 @@ static int __devinit snd_trident_mixer(trident_t * trident, int pcm_spdif_device
                 _ac97.num = 1;
                 err = snd_ac97_mixer(trident->ac97_bus, &_ac97, &trident->ac97_sec);
                 if (err < 0)
-                        snd_printk("SI7018: the secondary codec - invalid access\n");
+                        snd_printk(KERN_ERR "SI7018: the secondary codec - invalid access\n");
 #if 0   // only for my testing purpose --jk
                 {
                         ac97_t *mc97;
                         err = snd_ac97_modem(trident->card, &_ac97, &mc97);
                         if (err < 0)
-                                snd_printk("snd_ac97_modem returned error %i\n", err);
+                                snd_printk(KERN_ERR "snd_ac97_modem returned error %i\n", err);
                 }
 #endif
         }
@@ -3244,7 +3244,7 @@ static int snd_trident_sis_reset(trident_t *trident)
                         goto __si7018_ok;
                 do_delay(trident);
         } while (time_after_eq(end_time, jiffies));
-        snd_printk("AC'97 codec ready error [0x%x]\n", inl(TRID_REG(trident, SI_SERIAL_INTF_CTRL)));
+        snd_printk(KERN_ERR "AC'97 codec ready error [0x%x]\n", inl(TRID_REG(trident, SI_SERIAL_INTF_CTRL)));
         if (r-- > 0) {
                 end_time = jiffies + HZ;
                 do {
@@ -3542,7 +3542,7 @@ int __devinit snd_trident_create(snd_card_t * card,
         /* check, if we can restrict PCI DMA transfers to 30 bits */
         if (pci_set_dma_mask(pci, 0x3fffffff) < 0 ||
             pci_set_consistent_dma_mask(pci, 0x3fffffff) < 0) {
-                snd_printk("architecture does not support 30bit PCI busmaster DMA\n");
+                snd_printk(KERN_ERR "architecture does not support 30bit PCI busmaster DMA\n");
                 pci_disable_device(pci);
                 return -ENXIO;
         }
@@ -3579,7 +3579,7 @@ int __devinit snd_trident_create(snd_card_t * card,
         trident->port = pci_resource_start(pci, 0);
 
         if (request_irq(pci->irq, snd_trident_interrupt, SA_INTERRUPT|SA_SHIRQ, "Trident Audio", (void *) trident)) {
-                snd_printk("unable to grab IRQ %d\n", pci->irq);
+                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_trident_free(trident);
                 return -EBUSY;
         }
diff --git a/sound/pci/trident/trident_memory.c b/sound/pci/trident/trident_memory.c
index 333d3790692a..f3e6c546af74 100644
--- a/sound/pci/trident/trident_memory.c
+++ b/sound/pci/trident/trident_memory.c
@@ -170,11 +170,11 @@ __found_pages:
 static int is_valid_page(unsigned long ptr)
 {
         if (ptr & ~0x3fffffffUL) {
-                snd_printk("max memory size is 1GB!!\n");
+                snd_printk(KERN_ERR "max memory size is 1GB!!\n");
                 return 0;
         }
         if (ptr & (SNDRV_TRIDENT_PAGE_SIZE-1)) {
-                snd_printk("page is not aligned\n");
+                snd_printk(KERN_ERR "page is not aligned\n");
                 return 0;
         }
         return 1;
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c
index 3fdb3b1d4e83..9b2bea866d1b 100644
--- a/sound/pci/via82xx.c
+++ b/sound/pci/via82xx.c
@@ -865,7 +865,7 @@ static snd_pcm_uframes_t snd_via8233_pcm_pointer(snd_pcm_substream_t *substream)
                 idx = count >> 24;
                 if (idx >= viadev->tbl_entries) {
 #ifdef POINTER_DEBUG
-                        printk("fail: invalid idx = %i/%i\n", idx, viadev->tbl_entries);
+                        printk(KERN_DEBUG "fail: invalid idx = %i/%i\n", idx, viadev->tbl_entries);
 #endif
                         res = viadev->lastpos;
                 } else {
@@ -2032,7 +2032,7 @@ static int snd_via82xx_chip_init(via82xx_t *chip)
         } while (time_before(jiffies, end_time));
 
         if ((val = snd_via82xx_codec_xread(chip)) & VIA_REG_AC97_BUSY)
-                snd_printk("AC'97 codec is not ready [0x%x]\n", val);
+                snd_printk(KERN_ERR "AC'97 codec is not ready [0x%x]\n", val);
 
 #if 0 /* FIXME: we don't support the second codec yet so skip the detection now.. */
         snd_via82xx_codec_xwrite(chip, VIA_REG_AC97_READ |
@@ -2228,7 +2228,7 @@ static int __devinit snd_via82xx_create(snd_card_t * card,
                         snd_via8233_interrupt : snd_via686_interrupt,
                         SA_INTERRUPT|SA_SHIRQ,
                         card->driver, (void *)chip)) {
-                snd_printk("unable to grab IRQ %d\n", pci->irq);
+                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_via82xx_free(chip);
                 return -EBUSY;
         }
diff --git a/sound/pci/via82xx_modem.c b/sound/pci/via82xx_modem.c
index ff56eb8552e6..bc7330ace96a 100644
--- a/sound/pci/via82xx_modem.c
+++ b/sound/pci/via82xx_modem.c
@@ -570,7 +570,7 @@ static inline unsigned int calc_linear_pos(viadev_t *viadev, unsigned int idx, u
                 res = viadev->lastpos;
         } else if (check_invalid_pos(viadev, res)) {
 #ifdef POINTER_DEBUG
-                printk("fail: idx = %i/%i, lastpos = 0x%x, bufsize2 = 0x%x, offsize = 0x%x, size = 0x%x, count = 0x%x\n", idx, viadev->tbl_entries, viadev->lastpos, viadev->bufsize2, viadev->idx_table[idx].offset, viadev->idx_table[idx].size, count);
+                printk(KERN_DEBUG "fail: idx = %i/%i, lastpos = 0x%x, bufsize2 = 0x%x, offsize = 0x%x, size = 0x%x, count = 0x%x\n", idx, viadev->tbl_entries, viadev->lastpos, viadev->bufsize2, viadev->idx_table[idx].offset, viadev->idx_table[idx].size, count);
 #endif
                 if (count && size < count) {
                         snd_printd(KERN_ERR "invalid via82xx_cur_ptr, using last valid pointer\n");
@@ -973,7 +973,7 @@ static int snd_via82xx_chip_init(via82xx_t *chip)
         } while (time_before(jiffies, end_time));
 
         if ((val = snd_via82xx_codec_xread(chip)) & VIA_REG_AC97_BUSY)
-                snd_printk("AC'97 codec is not ready [0x%x]\n", val);
+                snd_printk(KERN_ERR "AC'97 codec is not ready [0x%x]\n", val);
 
         snd_via82xx_codec_xwrite(chip, VIA_REG_AC97_READ |
                                  VIA_REG_AC97_SECONDARY_VALID |
@@ -1102,7 +1102,7 @@ static int __devinit snd_via82xx_create(snd_card_t * card,
         chip->port = pci_resource_start(pci, 0);
         if (request_irq(pci->irq, snd_via82xx_interrupt, SA_INTERRUPT|SA_SHIRQ,
                         card->driver, (void *)chip)) {
-                snd_printk("unable to grab IRQ %d\n", pci->irq);
+                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_via82xx_free(chip);
                 return -EBUSY;
         }
diff --git a/sound/pci/ymfpci/ymfpci.c b/sound/pci/ymfpci/ymfpci.c
index e50d744ae706..1bbba32517ff 100644
--- a/sound/pci/ymfpci/ymfpci.c
+++ b/sound/pci/ymfpci/ymfpci.c
@@ -320,7 +320,7 @@ static int __devinit snd_card_ymfpci_probe(struct pci_dev *pci,
                         pci_write_config_word(pci, PCIR_DSXG_LEGACY, legacy_ctrl);
                 } else if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) < 0) {
                         snd_card_free(card);
-                        snd_printk("cannot create opl3 hwdep\n");
+                        snd_printk(KERN_ERR "cannot create opl3 hwdep\n");
                         return err;
                 }
         }
diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
index d27f3b56b513..a53117733d51 100644
--- a/sound/pci/ymfpci/ymfpci_main.c
+++ b/sound/pci/ymfpci/ymfpci_main.c
@@ -94,7 +94,7 @@ static int snd_ymfpci_codec_ready(ymfpci_t *chip, int secondary)
                 set_current_state(TASK_UNINTERRUPTIBLE);
                 schedule_timeout(1);
         } while (time_before(jiffies, end_time));
-        snd_printk("codec_ready: codec %i is not ready [0x%x]\n", secondary, snd_ymfpci_readw(chip, reg));
+        snd_printk(KERN_ERR "codec_ready: codec %i is not ready [0x%x]\n", secondary, snd_ymfpci_readw(chip, reg));
         return -EBUSY;
 }
 
@@ -2288,12 +2288,12 @@ int __devinit snd_ymfpci_create(snd_card_t * card,
         pci_set_master(pci);
 
         if ((chip->res_reg_area = request_mem_region(chip->reg_area_phys, 0x8000, "YMFPCI")) == NULL) {
-                snd_printk("unable to grab memory region 0x%lx-0x%lx\n", chip->reg_area_phys, chip->reg_area_phys + 0x8000 - 1);
+                snd_printk(KERN_ERR "unable to grab memory region 0x%lx-0x%lx\n", chip->reg_area_phys, chip->reg_area_phys + 0x8000 - 1);
                 snd_ymfpci_free(chip);
                 return -EBUSY;
         }
         if (request_irq(pci->irq, snd_ymfpci_interrupt, SA_INTERRUPT|SA_SHIRQ, "YMFPCI", (void *) chip)) {
-                snd_printk("unable to grab IRQ %d\n", pci->irq);
+                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_ymfpci_free(chip);
                 return -EBUSY;
         }