aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2005-10-21 10:20:11 -0400
committerJaroslav Kysela <perex@suse.cz>2005-11-04 07:19:32 -0500
commitd3d579f84ebf701dedd22ba696d1738ed6759ef7 (patch)
tree54cdc92d760b9dd350e8dc7ee11194f309c2e2a2
parent8a5afd29dc16a9e687f63195cb635ecd611482d0 (diff)
[ALSA] Add missing KERN_* prefix
Modules: ALSA<-OSS emulation,USB generic driver,USB USX2Y Added missing KERN_* prefix to printk. Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/core/oss/mixer_oss.c3
-rw-r--r--sound/core/oss/pcm_oss.c9
-rw-r--r--sound/usb/usbmixer.c2
-rw-r--r--sound/usb/usx2y/usX2Yhwdep.c10
-rw-r--r--sound/usb/usx2y/usbusx2y.c5
-rw-r--r--sound/usb/usx2y/usbusx2yaudio.c23
-rw-r--r--sound/usb/usx2y/usx2yhwdeppcm.c4
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)
1294 card, 0, 1294 card, 0,
1295 &snd_mixer_oss_reg, 1295 &snd_mixer_oss_reg,
1296 name)) < 0) { 1296 name)) < 0) {
1297 snd_printk("unable to register OSS mixer device %i:%i\n", card->number, 0); 1297 snd_printk(KERN_ERR "unable to register OSS mixer device %i:%i\n",
1298 card->number, 0);
1298 kfree(mixer); 1299 kfree(mixer);
1299 return err; 1300 return err;
1300 } 1301 }
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)
2457 if (snd_register_oss_device(SNDRV_OSS_DEVICE_TYPE_PCM, 2457 if (snd_register_oss_device(SNDRV_OSS_DEVICE_TYPE_PCM,
2458 pcm->card, index, &snd_pcm_oss_reg, 2458 pcm->card, index, &snd_pcm_oss_reg,
2459 name) < 0) { 2459 name) < 0) {
2460 snd_printk("unable to register OSS PCM device %i:%i\n", pcm->card->number, pcm->device); 2460 snd_printk(KERN_ERR "unable to register OSS PCM device %i:%i\n",
2461 pcm->card->number, pcm->device);
2461 } 2462 }
2462} 2463}
2463 2464
@@ -2539,11 +2540,13 @@ static int __init alsa_pcm_oss_init(void)
2539 /* check device map table */ 2540 /* check device map table */
2540 for (i = 0; i < SNDRV_CARDS; i++) { 2541 for (i = 0; i < SNDRV_CARDS; i++) {
2541 if (dsp_map[i] < 0 || dsp_map[i] >= SNDRV_PCM_DEVICES) { 2542 if (dsp_map[i] < 0 || dsp_map[i] >= SNDRV_PCM_DEVICES) {
2542 snd_printk("invalid dsp_map[%d] = %d\n", i, dsp_map[i]); 2543 snd_printk(KERN_ERR "invalid dsp_map[%d] = %d\n",
2544 i, dsp_map[i]);
2543 dsp_map[i] = 0; 2545 dsp_map[i] = 0;
2544 } 2546 }
2545 if (adsp_map[i] < 0 || adsp_map[i] >= SNDRV_PCM_DEVICES) { 2547 if (adsp_map[i] < 0 || adsp_map[i] >= SNDRV_PCM_DEVICES) {
2546 snd_printk("invalid adsp_map[%d] = %d\n", i, adsp_map[i]); 2548 snd_printk(KERN_ERR "invalid adsp_map[%d] = %d\n",
2549 i, adsp_map[i]);
2547 adsp_map[i] = 1; 2550 adsp_map[i] = 1;
2548 } 2551 }
2549 } 2552 }
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,
911 case USB_ID(0x0672, 0x1041): 911 case USB_ID(0x0672, 0x1041):
912 if (!strcmp(kctl->id.name, "PCM Playback Volume") && 912 if (!strcmp(kctl->id.name, "PCM Playback Volume") &&
913 cval->min == -15616) { 913 cval->min == -15616) {
914 snd_printk("using volume control quirk for the UDA1321/N101 chip\n"); 914 snd_printk(KERN_INFO "using volume control quirk for the UDA1321/N101 chip\n");
915 cval->max = -256; 915 cval->max = -256;
916 } 916 }
917 } 917 }
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)
193 193
194 do { 194 do {
195 if ((err = usX2Y_create_usbmidi(card)) < 0) { 195 if ((err = usX2Y_create_usbmidi(card)) < 0) {
196 snd_printk("usX2Y_create_alsa_devices: usX2Y_create_usbmidi error %i \n", err); 196 snd_printk(KERN_ERR "usX2Y_create_alsa_devices: usX2Y_create_usbmidi error %i \n", err);
197 break; 197 break;
198 } 198 }
199 if ((err = usX2Y_audio_create(card)) < 0) 199 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)
224 } 224 }
225 err = usb_set_interface(dev, 0, 1); 225 err = usb_set_interface(dev, 0, 1);
226 if (err) 226 if (err)
227 snd_printk("usb_set_interface error \n"); 227 snd_printk(KERN_ERR "usb_set_interface error \n");
228 else 228 else
229 err = usb_bulk_msg(dev, usb_sndbulkpipe(dev, 2), buf, dsp->length, &lret, 6000); 229 err = usb_bulk_msg(dev, usb_sndbulkpipe(dev, 2), buf, dsp->length, &lret, 6000);
230 kfree(buf); 230 kfree(buf);
@@ -235,17 +235,17 @@ static int snd_usX2Y_hwdep_dsp_load(snd_hwdep_t *hw, snd_hwdep_dsp_image_t *dsp)
235 msleep(250); // give the device some time 235 msleep(250); // give the device some time
236 err = usX2Y_AsyncSeq04_init(priv); 236 err = usX2Y_AsyncSeq04_init(priv);
237 if (err) { 237 if (err) {
238 snd_printk("usX2Y_AsyncSeq04_init error \n"); 238 snd_printk(KERN_ERR "usX2Y_AsyncSeq04_init error \n");
239 return err; 239 return err;
240 } 240 }
241 err = usX2Y_In04_init(priv); 241 err = usX2Y_In04_init(priv);
242 if (err) { 242 if (err) {
243 snd_printk("usX2Y_In04_init error \n"); 243 snd_printk(KERN_ERR "usX2Y_In04_init error \n");
244 return err; 244 return err;
245 } 245 }
246 err = usX2Y_create_alsa_devices(hw->card); 246 err = usX2Y_create_alsa_devices(hw->card);
247 if (err) { 247 if (err) {
248 snd_printk("usX2Y_create_alsa_devices error %i \n", err); 248 snd_printk(KERN_ERR "usX2Y_create_alsa_devices error %i \n", err);
249 snd_card_free(hw->card); 249 snd_card_free(hw->card);
250 return err; 250 return err;
251 } 251 }
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)
251 } 251 }
252 } 252 }
253 253
254 if (err) { 254 if (err)
255 snd_printk("In04Int() usb_submit_urb err=%i\n", err); 255 snd_printk(KERN_ERR "In04Int() usb_submit_urb err=%i\n", err);
256 }
257 256
258 urb->dev = usX2Y->chip.dev; 257 urb->dev = usX2Y->chip.dev;
259 usb_submit_urb(urb, GFP_ATOMIC); 258 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)
78 for (i = 0; i < nr_of_packs(); i++) { 78 for (i = 0; i < nr_of_packs(); i++) {
79 cp = (unsigned char*)urb->transfer_buffer + urb->iso_frame_desc[i].offset; 79 cp = (unsigned char*)urb->transfer_buffer + urb->iso_frame_desc[i].offset;
80 if (urb->iso_frame_desc[i].status) { /* active? hmm, skip this */ 80 if (urb->iso_frame_desc[i].status) { /* active? hmm, skip this */
81 snd_printk("activ frame status %i. Most propably some hardware problem.\n", urb->iso_frame_desc[i].status); 81 snd_printk(KERN_ERR "activ frame status %i. Most propably some hardware problem.\n", urb->iso_frame_desc[i].status);
82 return urb->iso_frame_desc[i].status; 82 return urb->iso_frame_desc[i].status;
83 } 83 }
84 len = urb->iso_frame_desc[i].actual_length / usX2Y->stride; 84 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,
134 counts = cap_urb->iso_frame_desc[pack].actual_length / usX2Y->stride; 134 counts = cap_urb->iso_frame_desc[pack].actual_length / usX2Y->stride;
135 count += counts; 135 count += counts;
136 if (counts < 43 || counts > 50) { 136 if (counts < 43 || counts > 50) {
137 snd_printk("should not be here with counts=%i\n", counts); 137 snd_printk(KERN_ERR "should not be here with counts=%i\n", counts);
138 return -EPIPE; 138 return -EPIPE;
139 } 139 }
140 /* set up descriptor */ 140 /* set up descriptor */
@@ -196,7 +196,7 @@ static int usX2Y_urb_submit(snd_usX2Y_substream_t *subs, struct urb *urb, int fr
196 urb->hcpriv = NULL; 196 urb->hcpriv = NULL;
197 urb->dev = subs->usX2Y->chip.dev; /* we need to set this at each time */ 197 urb->dev = subs->usX2Y->chip.dev; /* we need to set this at each time */
198 if ((err = usb_submit_urb(urb, GFP_ATOMIC)) < 0) { 198 if ((err = usb_submit_urb(urb, GFP_ATOMIC)) < 0) {
199 snd_printk("usb_submit_urb() returned %i\n", err); 199 snd_printk(KERN_ERR "usb_submit_urb() returned %i\n", err);
200 return err; 200 return err;
201 } 201 }
202 return 0; 202 return 0;
@@ -283,16 +283,16 @@ static void usX2Y_clients_stop(usX2Ydev_t *usX2Y)
283 283
284static void usX2Y_error_urb_status(usX2Ydev_t *usX2Y, snd_usX2Y_substream_t *subs, struct urb *urb) 284static void usX2Y_error_urb_status(usX2Ydev_t *usX2Y, snd_usX2Y_substream_t *subs, struct urb *urb)
285{ 285{
286 snd_printk("ep=%i stalled with status=%i\n", subs->endpoint, urb->status); 286 snd_printk(KERN_ERR "ep=%i stalled with status=%i\n", subs->endpoint, urb->status);
287 urb->status = 0; 287 urb->status = 0;
288 usX2Y_clients_stop(usX2Y); 288 usX2Y_clients_stop(usX2Y);
289} 289}
290 290
291static void usX2Y_error_sequence(usX2Ydev_t *usX2Y, snd_usX2Y_substream_t *subs, struct urb *urb) 291static void usX2Y_error_sequence(usX2Ydev_t *usX2Y, snd_usX2Y_substream_t *subs, struct urb *urb)
292{ 292{
293 snd_printk("Sequence Error!(hcd_frame=%i ep=%i%s;wait=%i,frame=%i).\n" 293 snd_printk(KERN_ERR "Sequence Error!(hcd_frame=%i ep=%i%s;wait=%i,frame=%i).\n"
294 "Most propably some urb of usb-frame %i is still missing.\n" 294 KERN_ERR "Most propably some urb of usb-frame %i is still missing.\n"
295 "Cause could be too long delays in usb-hcd interrupt handling.\n", 295 KERN_ERR "Cause could be too long delays in usb-hcd interrupt handling.\n",
296 usb_get_current_frame_number(usX2Y->chip.dev), 296 usb_get_current_frame_number(usX2Y->chip.dev),
297 subs->endpoint, usb_pipein(urb->pipe) ? "in" : "out", usX2Y->wait_iso_frame, urb->start_frame, usX2Y->wait_iso_frame); 297 subs->endpoint, usb_pipein(urb->pipe) ? "in" : "out", usX2Y->wait_iso_frame, urb->start_frame, usX2Y->wait_iso_frame);
298 usX2Y_clients_stop(usX2Y); 298 usX2Y_clients_stop(usX2Y);
@@ -653,9 +653,8 @@ static void i_usX2Y_04Int(struct urb* urb, struct pt_regs *regs)
653{ 653{
654 usX2Ydev_t* usX2Y = urb->context; 654 usX2Ydev_t* usX2Y = urb->context;
655 655
656 if (urb->status) { 656 if (urb->status)
657 snd_printk("snd_usX2Y_04Int() urb->status=%i\n", urb->status); 657 snd_printk(KERN_ERR "snd_usX2Y_04Int() urb->status=%i\n", urb->status);
658 }
659 if (0 == --usX2Y->US04->len) 658 if (0 == --usX2Y->US04->len)
660 wake_up(&usX2Y->In04WaitQueue); 659 wake_up(&usX2Y->In04WaitQueue);
661} 660}
@@ -740,7 +739,7 @@ static int usX2Y_format_set(usX2Ydev_t *usX2Y, snd_pcm_format_t format)
740 } 739 }
741 usb_kill_urb(usX2Y->In04urb); 740 usb_kill_urb(usX2Y->In04urb);
742 if ((err = usb_set_interface(usX2Y->chip.dev, 0, alternate))) { 741 if ((err = usb_set_interface(usX2Y->chip.dev, 0, alternate))) {
743 snd_printk("usb_set_interface error \n"); 742 snd_printk(KERN_ERR "usb_set_interface error \n");
744 return err; 743 return err;
745 } 744 }
746 usX2Y->In04urb->dev = usX2Y->chip.dev; 745 usX2Y->In04urb->dev = usX2Y->chip.dev;
@@ -787,7 +786,7 @@ static int snd_usX2Y_pcm_hw_params(snd_pcm_substream_t *substream,
787 } 786 }
788 } 787 }
789 if (0 > (err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params)))) { 788 if (0 > (err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params)))) {
790 snd_printk("snd_pcm_lib_malloc_pages(%p, %i) returned %i\n", substream, params_buffer_bytes(hw_params), err); 789 snd_printk(KERN_ERR "snd_pcm_lib_malloc_pages(%p, %i) returned %i\n", substream, params_buffer_bytes(hw_params), err);
791 return err; 790 return err;
792 } 791 }
793 return 0; 792 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)
73 } 73 }
74 for (i = 0; i < nr_of_packs(); i++) { 74 for (i = 0; i < nr_of_packs(); i++) {
75 if (urb->iso_frame_desc[i].status) { /* active? hmm, skip this */ 75 if (urb->iso_frame_desc[i].status) { /* active? hmm, skip this */
76 snd_printk("activ frame status %i. Most propably some hardware problem.\n", urb->iso_frame_desc[i].status); 76 snd_printk(KERN_ERR "activ frame status %i. Most propably some hardware problem.\n", urb->iso_frame_desc[i].status);
77 return urb->iso_frame_desc[i].status; 77 return urb->iso_frame_desc[i].status;
78 } 78 }
79 lens += urb->iso_frame_desc[i].actual_length / usX2Y->stride; 79 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,
126 /* calculate the size of a packet */ 126 /* calculate the size of a packet */
127 counts = shm->captured_iso[shm->playback_iso_head].length / usX2Y->stride; 127 counts = shm->captured_iso[shm->playback_iso_head].length / usX2Y->stride;
128 if (counts < 43 || counts > 50) { 128 if (counts < 43 || counts > 50) {
129 snd_printk("should not be here with counts=%i\n", counts); 129 snd_printk(KERN_ERR "should not be here with counts=%i\n", counts);
130 return -EPIPE; 130 return -EPIPE;
131 } 131 }
132 /* set up descriptor */ 132 /* set up descriptor */