7 files changed, 29 insertions, 27 deletions

diff --git a/sound/core/oss/mixer_oss.c b/sound/core/oss/mixer_oss.c
index b2497cec2079..214933cf5d49 100644
--- a/sound/core/oss/mixer_oss.c
+++ b/sound/core/oss/mixer_oss.c
@@ -1294,7 +1294,8 @@ static int snd_mixer_oss_notify_handler(snd_card_t * card, int cmd)
                                                    card, 0,
                                                    &snd_mixer_oss_reg,
                                                    name)) < 0) {
-                        snd_printk("unable to register OSS mixer device %i:%i\n", card->number, 0);
+                        snd_printk(KERN_ERR "unable to register OSS mixer device %i:%i\n",
+                                   card->number, 0);
                         kfree(mixer);
                         return err;
                 }
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
index c57f702d31a7..bcc970759134 100644
--- a/sound/core/oss/pcm_oss.c
+++ b/sound/core/oss/pcm_oss.c
@@ -2457,7 +2457,8 @@ static void register_oss_dsp(snd_pcm_t *pcm, int index)
         if (snd_register_oss_device(SNDRV_OSS_DEVICE_TYPE_PCM,
                                     pcm->card, index, &snd_pcm_oss_reg,
                                     name) < 0) {
-                snd_printk("unable to register OSS PCM device %i:%i\n", pcm->card->number, pcm->device);
+                snd_printk(KERN_ERR "unable to register OSS PCM device %i:%i\n",
+                           pcm->card->number, pcm->device);
         }
 }
 
@@ -2539,11 +2540,13 @@ static int __init alsa_pcm_oss_init(void)
         /* check device map table */
         for (i = 0; i < SNDRV_CARDS; i++) {
                 if (dsp_map[i] < 0 || dsp_map[i] >= SNDRV_PCM_DEVICES) {
-                        snd_printk("invalid dsp_map[%d] = %d\n", i, dsp_map[i]);
+                        snd_printk(KERN_ERR "invalid dsp_map[%d] = %d\n",
+                                   i, dsp_map[i]);
                         dsp_map[i] = 0;
                 }
                 if (adsp_map[i] < 0 || adsp_map[i] >= SNDRV_PCM_DEVICES) {
-                        snd_printk("invalid adsp_map[%d] = %d\n", i, adsp_map[i]);
+                        snd_printk(KERN_ERR "invalid adsp_map[%d] = %d\n",
+                                   i, adsp_map[i]);
                         adsp_map[i] = 1;
                 }
         }
diff --git a/sound/usb/usbmixer.c b/sound/usb/usbmixer.c
index c3c08c9cb46e..e570d140258d 100644
--- a/sound/usb/usbmixer.c
+++ b/sound/usb/usbmixer.c
@@ -911,7 +911,7 @@ static void build_feature_ctl(mixer_build_t *state, unsigned char *desc,
         case USB_ID(0x0672, 0x1041):
                 if (!strcmp(kctl->id.name, "PCM Playback Volume") &&
                     cval->min == -15616) {
-                        snd_printk("using volume control quirk for the UDA1321/N101 chip\n");
+                        snd_printk(KERN_INFO "using volume control quirk for the UDA1321/N101 chip\n");
                         cval->max = -256;
                 }
         }
diff --git a/sound/usb/usx2y/usX2Yhwdep.c b/sound/usb/usx2y/usX2Yhwdep.c
index 0281a362857a..8abe08611df6 100644
--- a/sound/usb/usx2y/usX2Yhwdep.c
+++ b/sound/usb/usx2y/usX2Yhwdep.c
@@ -193,7 +193,7 @@ static int usX2Y_create_alsa_devices(snd_card_t* card)
 
         do {
                 if ((err = usX2Y_create_usbmidi(card)) < 0) {
-                        snd_printk("usX2Y_create_alsa_devices: usX2Y_create_usbmidi error %i \n", err);
+                        snd_printk(KERN_ERR "usX2Y_create_alsa_devices: usX2Y_create_usbmidi error %i \n", err);
                         break;
                 }
                 if ((err = usX2Y_audio_create(card)) < 0) 
@@ -224,7 +224,7 @@ static int snd_usX2Y_hwdep_dsp_load(snd_hwdep_t *hw, snd_hwdep_dsp_image_t *dsp)
                 }
                 err = usb_set_interface(dev, 0, 1);
                 if (err)
-                        snd_printk("usb_set_interface error \n");
+                        snd_printk(KERN_ERR "usb_set_interface error \n");
                 else
                         err = usb_bulk_msg(dev, usb_sndbulkpipe(dev, 2), buf, dsp->length, &lret, 6000);
                 kfree(buf);
@@ -235,17 +235,17 @@ static int snd_usX2Y_hwdep_dsp_load(snd_hwdep_t *hw, snd_hwdep_dsp_image_t *dsp)
                 msleep(250);                            // give the device some time
                 err = usX2Y_AsyncSeq04_init(priv);
                 if (err) {
-                        snd_printk("usX2Y_AsyncSeq04_init error \n");
+                        snd_printk(KERN_ERR "usX2Y_AsyncSeq04_init error \n");
                         return err;
                 }
                 err = usX2Y_In04_init(priv);
                 if (err) {
-                        snd_printk("usX2Y_In04_init error \n");
+                        snd_printk(KERN_ERR "usX2Y_In04_init error \n");
                         return err;
                 }
                 err = usX2Y_create_alsa_devices(hw->card);
                 if (err) {
-                        snd_printk("usX2Y_create_alsa_devices error %i \n", err);
+                        snd_printk(KERN_ERR "usX2Y_create_alsa_devices error %i \n", err);
                         snd_card_free(hw->card);
                         return err;
                 }
diff --git a/sound/usb/usx2y/usbusx2y.c b/sound/usb/usx2y/usbusx2y.c
index e6e6da159671..cf77313c609d 100644
--- a/sound/usb/usx2y/usbusx2y.c
+++ b/sound/usb/usx2y/usbusx2y.c
@@ -251,9 +251,8 @@ static void i_usX2Y_In04Int(struct urb* urb, struct pt_regs *regs)
                         }
                 }
 
-        if (err) {
-                snd_printk("In04Int() usb_submit_urb err=%i\n", err);
-        }
+        if (err)
+                snd_printk(KERN_ERR "In04Int() usb_submit_urb err=%i\n", err);
 
         urb->dev = usX2Y->chip.dev;
         usb_submit_urb(urb, GFP_ATOMIC);
diff --git a/sound/usb/usx2y/usbusx2yaudio.c b/sound/usb/usx2y/usbusx2yaudio.c
index 0f09e0de52dd..affda973cece 100644
--- a/sound/usb/usx2y/usbusx2yaudio.c
+++ b/sound/usb/usx2y/usbusx2yaudio.c
@@ -78,7 +78,7 @@ static int usX2Y_urb_capt_retire(snd_usX2Y_substream_t *subs)
         for (i = 0; i < nr_of_packs(); i++) {
                 cp = (unsigned char*)urb->transfer_buffer + urb->iso_frame_desc[i].offset;
                 if (urb->iso_frame_desc[i].status) { /* active? hmm, skip this */
-                        snd_printk("activ frame status %i. Most propably some hardware problem.\n", urb->iso_frame_desc[i].status);
+                        snd_printk(KERN_ERR "activ frame status %i. Most propably some hardware problem.\n", urb->iso_frame_desc[i].status);
                         return urb->iso_frame_desc[i].status;
                 }
                 len = urb->iso_frame_desc[i].actual_length / usX2Y->stride;
@@ -134,7 +134,7 @@ static int usX2Y_urb_play_prepare(snd_usX2Y_substream_t *subs,
                 counts = cap_urb->iso_frame_desc[pack].actual_length / usX2Y->stride;
                 count += counts;
                 if (counts < 43 || counts > 50) {
-                        snd_printk("should not be here with counts=%i\n", counts);
+                        snd_printk(KERN_ERR "should not be here with counts=%i\n", counts);
                         return -EPIPE;
                 }
                 /* set up descriptor */
@@ -196,7 +196,7 @@ static int usX2Y_urb_submit(snd_usX2Y_substream_t *subs, struct urb *urb, int fr
         urb->hcpriv = NULL;
         urb->dev = subs->usX2Y->chip.dev; /* we need to set this at each time */
         if ((err = usb_submit_urb(urb, GFP_ATOMIC)) < 0) {
-                snd_printk("usb_submit_urb() returned %i\n", err);
+                snd_printk(KERN_ERR "usb_submit_urb() returned %i\n", err);
                 return err;
         }
         return 0;
@@ -283,16 +283,16 @@ static void usX2Y_clients_stop(usX2Ydev_t *usX2Y)
 
 static void usX2Y_error_urb_status(usX2Ydev_t *usX2Y, snd_usX2Y_substream_t *subs, struct urb *urb)
 {
-        snd_printk("ep=%i stalled with status=%i\n", subs->endpoint, urb->status);
+        snd_printk(KERN_ERR "ep=%i stalled with status=%i\n", subs->endpoint, urb->status);
         urb->status = 0;
         usX2Y_clients_stop(usX2Y);
 }
 
 static void usX2Y_error_sequence(usX2Ydev_t *usX2Y, snd_usX2Y_substream_t *subs, struct urb *urb)
 {
-        snd_printk("Sequence Error!(hcd_frame=%i ep=%i%s;wait=%i,frame=%i).\n"
-                   "Most propably some urb of usb-frame %i is still missing.\n"
-                   "Cause could be too long delays in usb-hcd interrupt handling.\n",
+        snd_printk(KERN_ERR "Sequence Error!(hcd_frame=%i ep=%i%s;wait=%i,frame=%i).\n"
+                   KERN_ERR "Most propably some urb of usb-frame %i is still missing.\n"
+                   KERN_ERR "Cause could be too long delays in usb-hcd interrupt handling.\n",
                    usb_get_current_frame_number(usX2Y->chip.dev),
                    subs->endpoint, usb_pipein(urb->pipe) ? "in" : "out", usX2Y->wait_iso_frame, urb->start_frame, usX2Y->wait_iso_frame);
         usX2Y_clients_stop(usX2Y);
@@ -653,9 +653,8 @@ static void i_usX2Y_04Int(struct urb* urb, struct pt_regs *regs)
 {
         usX2Ydev_t*     usX2Y = urb->context;
         
-        if (urb->status) {
-                snd_printk("snd_usX2Y_04Int() urb->status=%i\n", urb->status);
-        }
+        if (urb->status)
+                snd_printk(KERN_ERR "snd_usX2Y_04Int() urb->status=%i\n", urb->status);
         if (0 == --usX2Y->US04->len)
                 wake_up(&usX2Y->In04WaitQueue);
 }
@@ -740,7 +739,7 @@ static int usX2Y_format_set(usX2Ydev_t *usX2Y, snd_pcm_format_t format)
         }
         usb_kill_urb(usX2Y->In04urb);
         if ((err = usb_set_interface(usX2Y->chip.dev, 0, alternate))) {
-                snd_printk("usb_set_interface error \n");
+                snd_printk(KERN_ERR "usb_set_interface error \n");
                 return err;
         }
         usX2Y->In04urb->dev = usX2Y->chip.dev;
@@ -787,7 +786,7 @@ static int snd_usX2Y_pcm_hw_params(snd_pcm_substream_t *substream,
                 }
         }
         if (0 > (err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params)))) {
-                snd_printk("snd_pcm_lib_malloc_pages(%p, %i) returned %i\n", substream, params_buffer_bytes(hw_params), err);
+                snd_printk(KERN_ERR "snd_pcm_lib_malloc_pages(%p, %i) returned %i\n", substream, params_buffer_bytes(hw_params), err);
                 return err;
         }
         return 0;
diff --git a/sound/usb/usx2y/usx2yhwdeppcm.c b/sound/usb/usx2y/usx2yhwdeppcm.c
index d0199c4e5551..0dc828ff9e94 100644
--- a/sound/usb/usx2y/usx2yhwdeppcm.c
+++ b/sound/usb/usx2y/usx2yhwdeppcm.c
@@ -73,7 +73,7 @@ static int usX2Y_usbpcm_urb_capt_retire(snd_usX2Y_substream_t *subs)
         }
         for (i = 0; i < nr_of_packs(); i++) {
                 if (urb->iso_frame_desc[i].status) { /* active? hmm, skip this */
-                        snd_printk("activ frame status %i. Most propably some hardware problem.\n", urb->iso_frame_desc[i].status);
+                        snd_printk(KERN_ERR "activ frame status %i. Most propably some hardware problem.\n", urb->iso_frame_desc[i].status);
                         return urb->iso_frame_desc[i].status;
                 }
                 lens += urb->iso_frame_desc[i].actual_length / usX2Y->stride;
@@ -126,7 +126,7 @@ static int usX2Y_hwdep_urb_play_prepare(snd_usX2Y_substream_t *subs,
                 /* calculate the size of a packet */
                 counts = shm->captured_iso[shm->playback_iso_head].length / usX2Y->stride;
                 if (counts < 43 || counts > 50) {
-                        snd_printk("should not be here with counts=%i\n", counts);
+                        snd_printk(KERN_ERR "should not be here with counts=%i\n", counts);
                         return -EPIPE;
                 }
                 /* set up descriptor */