Pārlūkot izejas kodu

ALSA: usb - Add missing KERN_* prefix to printk

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai 16 gadi atpakaļ
vecāks
revīzija
54530bded6
3 mainītis faili ar 9 papildinājumiem un 4 dzēšanām
  1. 4 2
      sound/usb/usbaudio.c
  2. 4 1
      sound/usb/usbmixer.c
  3. 1 1
      sound/usb/usx2y/usb_stream.c

+ 4 - 2
sound/usb/usbaudio.c

@@ -1419,9 +1419,11 @@ static int set_format(struct snd_usb_substream *subs, struct audioformat *fmt)
 	subs->cur_audiofmt = fmt;
 	subs->cur_audiofmt = fmt;
 
 
 #if 0
 #if 0
-	printk("setting done: format = %d, rate = %d..%d, channels = %d\n",
+	printk(KERN_DEBUG
+	       "setting done: format = %d, rate = %d..%d, channels = %d\n",
 	       fmt->format, fmt->rate_min, fmt->rate_max, fmt->channels);
 	       fmt->format, fmt->rate_min, fmt->rate_max, fmt->channels);
-	printk("  datapipe = 0x%0x, syncpipe = 0x%0x\n",
+	printk(KERN_DEBUG
+	       "  datapipe = 0x%0x, syncpipe = 0x%0x\n",
 	       subs->datapipe, subs->syncpipe);
 	       subs->datapipe, subs->syncpipe);
 #endif
 #endif
 
 

+ 4 - 1
sound/usb/usbmixer.c

@@ -222,7 +222,10 @@ static int check_ignored_ctl(struct mixer_build *state, int unitid, int control)
 	for (p = state->map; p->id; p++) {
 	for (p = state->map; p->id; p++) {
 		if (p->id == unitid && ! p->name &&
 		if (p->id == unitid && ! p->name &&
 		    (! control || ! p->control || control == p->control)) {
 		    (! control || ! p->control || control == p->control)) {
-			// printk("ignored control %d:%d\n", unitid, control);
+			/*
+			printk(KERN_DEBUG "ignored control %d:%d\n",
+			       unitid, control);
+			*/
 			return 1;
 			return 1;
 		}
 		}
 	}
 	}

+ 1 - 1
sound/usb/usx2y/usb_stream.c

@@ -557,7 +557,7 @@ static void stream_start(struct usb_stream_kernel *sk,
 		s->idle_insize -= max_diff - max_diff_0;
 		s->idle_insize -= max_diff - max_diff_0;
 		s->idle_insize += urb_size - s->period_size;
 		s->idle_insize += urb_size - s->period_size;
 		if (s->idle_insize < 0) {
 		if (s->idle_insize < 0) {
-			snd_printk("%i %i %i\n",
+			snd_printk(KERN_WARNING "%i %i %i\n",
 				   s->idle_insize, urb_size, s->period_size);
 				   s->idle_insize, urb_size, s->period_size);
 			return;
 			return;
 		} else if (s->idle_insize == 0) {
 		} else if (s->idle_insize == 0) {