diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-02-05 09:51:50 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-02-05 10:00:56 -0500 |
commit | 45203832df2fa9e94ca0a249ddb20d2b077e58cc (patch) | |
tree | 54b5fed5a98235333ee01706751e9e898ee56c77 /sound/drivers/opl3 | |
parent | 006de267351aa3d836f3307370eae7ec16eac09d (diff) |
ALSA: Add missing KERN_* prefix to printk in sound/drivers
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/drivers/opl3')
-rw-r--r-- | sound/drivers/opl3/opl3_lib.c | 2 | ||||
-rw-r--r-- | sound/drivers/opl3/opl3_midi.c | 30 | ||||
-rw-r--r-- | sound/drivers/opl3/opl3_oss.c | 8 | ||||
-rw-r--r-- | sound/drivers/opl3/opl3_synth.c | 2 |
4 files changed, 22 insertions, 20 deletions
diff --git a/sound/drivers/opl3/opl3_lib.c b/sound/drivers/opl3/opl3_lib.c index 780582340fef..6e31e46ca393 100644 --- a/sound/drivers/opl3/opl3_lib.c +++ b/sound/drivers/opl3/opl3_lib.c | |||
@@ -302,7 +302,7 @@ void snd_opl3_interrupt(struct snd_hwdep * hw) | |||
302 | opl3 = hw->private_data; | 302 | opl3 = hw->private_data; |
303 | status = inb(opl3->l_port); | 303 | status = inb(opl3->l_port); |
304 | #if 0 | 304 | #if 0 |
305 | snd_printk("AdLib IRQ status = 0x%x\n", status); | 305 | snd_printk(KERN_DEBUG "AdLib IRQ status = 0x%x\n", status); |
306 | #endif | 306 | #endif |
307 | if (!(status & 0x80)) | 307 | if (!(status & 0x80)) |
308 | return; | 308 | return; |
diff --git a/sound/drivers/opl3/opl3_midi.c b/sound/drivers/opl3/opl3_midi.c index 16feafa2c51e..6e7d09ae0e82 100644 --- a/sound/drivers/opl3/opl3_midi.c +++ b/sound/drivers/opl3/opl3_midi.c | |||
@@ -125,7 +125,7 @@ static void debug_alloc(struct snd_opl3 *opl3, char *s, int voice) { | |||
125 | int i; | 125 | int i; |
126 | char *str = "x.24"; | 126 | char *str = "x.24"; |
127 | 127 | ||
128 | printk("time %.5i: %s [%.2i]: ", opl3->use_time, s, voice); | 128 | printk(KERN_DEBUG "time %.5i: %s [%.2i]: ", opl3->use_time, s, voice); |
129 | for (i = 0; i < opl3->max_voices; i++) | 129 | for (i = 0; i < opl3->max_voices; i++) |
130 | printk("%c", *(str + opl3->voices[i].state + 1)); | 130 | printk("%c", *(str + opl3->voices[i].state + 1)); |
131 | printk("\n"); | 131 | printk("\n"); |
@@ -218,7 +218,7 @@ static int opl3_get_voice(struct snd_opl3 *opl3, int instr_4op, | |||
218 | for (i = 0; i < END; i++) { | 218 | for (i = 0; i < END; i++) { |
219 | if (best[i].voice >= 0) { | 219 | if (best[i].voice >= 0) { |
220 | #ifdef DEBUG_ALLOC | 220 | #ifdef DEBUG_ALLOC |
221 | printk("%s %iop allocation on voice %i\n", | 221 | printk(KERN_DEBUG "%s %iop allocation on voice %i\n", |
222 | alloc_type[i], instr_4op ? 4 : 2, | 222 | alloc_type[i], instr_4op ? 4 : 2, |
223 | best[i].voice); | 223 | best[i].voice); |
224 | #endif | 224 | #endif |
@@ -317,7 +317,7 @@ void snd_opl3_note_on(void *p, int note, int vel, struct snd_midi_channel *chan) | |||
317 | opl3 = p; | 317 | opl3 = p; |
318 | 318 | ||
319 | #ifdef DEBUG_MIDI | 319 | #ifdef DEBUG_MIDI |
320 | snd_printk("Note on, ch %i, inst %i, note %i, vel %i\n", | 320 | snd_printk(KERN_DEBUG "Note on, ch %i, inst %i, note %i, vel %i\n", |
321 | chan->number, chan->midi_program, note, vel); | 321 | chan->number, chan->midi_program, note, vel); |
322 | #endif | 322 | #endif |
323 | 323 | ||
@@ -372,7 +372,7 @@ void snd_opl3_note_on(void *p, int note, int vel, struct snd_midi_channel *chan) | |||
372 | return; | 372 | return; |
373 | } | 373 | } |
374 | #ifdef DEBUG_MIDI | 374 | #ifdef DEBUG_MIDI |
375 | snd_printk(" --> OPL%i instrument: %s\n", | 375 | snd_printk(KERN_DEBUG " --> OPL%i instrument: %s\n", |
376 | instr_4op ? 3 : 2, patch->name); | 376 | instr_4op ? 3 : 2, patch->name); |
377 | #endif | 377 | #endif |
378 | /* in SYNTH mode, application takes care of voices */ | 378 | /* in SYNTH mode, application takes care of voices */ |
@@ -431,7 +431,7 @@ void snd_opl3_note_on(void *p, int note, int vel, struct snd_midi_channel *chan) | |||
431 | } | 431 | } |
432 | 432 | ||
433 | #ifdef DEBUG_MIDI | 433 | #ifdef DEBUG_MIDI |
434 | snd_printk(" --> setting OPL3 connection: 0x%x\n", | 434 | snd_printk(KERN_DEBUG " --> setting OPL3 connection: 0x%x\n", |
435 | opl3->connection_reg); | 435 | opl3->connection_reg); |
436 | #endif | 436 | #endif |
437 | /* | 437 | /* |
@@ -466,7 +466,7 @@ void snd_opl3_note_on(void *p, int note, int vel, struct snd_midi_channel *chan) | |||
466 | /* Program the FM voice characteristics */ | 466 | /* Program the FM voice characteristics */ |
467 | for (i = 0; i < (instr_4op ? 4 : 2); i++) { | 467 | for (i = 0; i < (instr_4op ? 4 : 2); i++) { |
468 | #ifdef DEBUG_MIDI | 468 | #ifdef DEBUG_MIDI |
469 | snd_printk(" --> programming operator %i\n", i); | 469 | snd_printk(KERN_DEBUG " --> programming operator %i\n", i); |
470 | #endif | 470 | #endif |
471 | op_offset = snd_opl3_regmap[voice_offset][i]; | 471 | op_offset = snd_opl3_regmap[voice_offset][i]; |
472 | 472 | ||
@@ -546,7 +546,7 @@ void snd_opl3_note_on(void *p, int note, int vel, struct snd_midi_channel *chan) | |||
546 | blocknum |= OPL3_KEYON_BIT; | 546 | blocknum |= OPL3_KEYON_BIT; |
547 | 547 | ||
548 | #ifdef DEBUG_MIDI | 548 | #ifdef DEBUG_MIDI |
549 | snd_printk(" --> trigger voice %i\n", voice); | 549 | snd_printk(KERN_DEBUG " --> trigger voice %i\n", voice); |
550 | #endif | 550 | #endif |
551 | /* Set OPL3 KEYON_BLOCK register of requested voice */ | 551 | /* Set OPL3 KEYON_BLOCK register of requested voice */ |
552 | opl3_reg = reg_side | (OPL3_REG_KEYON_BLOCK + voice_offset); | 552 | opl3_reg = reg_side | (OPL3_REG_KEYON_BLOCK + voice_offset); |
@@ -602,7 +602,7 @@ void snd_opl3_note_on(void *p, int note, int vel, struct snd_midi_channel *chan) | |||
602 | prg = extra_prg - 1; | 602 | prg = extra_prg - 1; |
603 | } | 603 | } |
604 | #ifdef DEBUG_MIDI | 604 | #ifdef DEBUG_MIDI |
605 | snd_printk(" *** allocating extra program\n"); | 605 | snd_printk(KERN_DEBUG " *** allocating extra program\n"); |
606 | #endif | 606 | #endif |
607 | goto __extra_prg; | 607 | goto __extra_prg; |
608 | } | 608 | } |
@@ -633,7 +633,7 @@ static void snd_opl3_kill_voice(struct snd_opl3 *opl3, int voice) | |||
633 | 633 | ||
634 | /* kill voice */ | 634 | /* kill voice */ |
635 | #ifdef DEBUG_MIDI | 635 | #ifdef DEBUG_MIDI |
636 | snd_printk(" --> kill voice %i\n", voice); | 636 | snd_printk(KERN_DEBUG " --> kill voice %i\n", voice); |
637 | #endif | 637 | #endif |
638 | opl3_reg = reg_side | (OPL3_REG_KEYON_BLOCK + voice_offset); | 638 | opl3_reg = reg_side | (OPL3_REG_KEYON_BLOCK + voice_offset); |
639 | /* clear Key ON bit */ | 639 | /* clear Key ON bit */ |
@@ -670,7 +670,7 @@ void snd_opl3_note_off(void *p, int note, int vel, struct snd_midi_channel *chan | |||
670 | opl3 = p; | 670 | opl3 = p; |
671 | 671 | ||
672 | #ifdef DEBUG_MIDI | 672 | #ifdef DEBUG_MIDI |
673 | snd_printk("Note off, ch %i, inst %i, note %i\n", | 673 | snd_printk(KERN_DEBUG "Note off, ch %i, inst %i, note %i\n", |
674 | chan->number, chan->midi_program, note); | 674 | chan->number, chan->midi_program, note); |
675 | #endif | 675 | #endif |
676 | 676 | ||
@@ -709,7 +709,7 @@ void snd_opl3_key_press(void *p, int note, int vel, struct snd_midi_channel *cha | |||
709 | 709 | ||
710 | opl3 = p; | 710 | opl3 = p; |
711 | #ifdef DEBUG_MIDI | 711 | #ifdef DEBUG_MIDI |
712 | snd_printk("Key pressure, ch#: %i, inst#: %i\n", | 712 | snd_printk(KERN_DEBUG "Key pressure, ch#: %i, inst#: %i\n", |
713 | chan->number, chan->midi_program); | 713 | chan->number, chan->midi_program); |
714 | #endif | 714 | #endif |
715 | } | 715 | } |
@@ -723,7 +723,7 @@ void snd_opl3_terminate_note(void *p, int note, struct snd_midi_channel *chan) | |||
723 | 723 | ||
724 | opl3 = p; | 724 | opl3 = p; |
725 | #ifdef DEBUG_MIDI | 725 | #ifdef DEBUG_MIDI |
726 | snd_printk("Terminate note, ch#: %i, inst#: %i\n", | 726 | snd_printk(KERN_DEBUG "Terminate note, ch#: %i, inst#: %i\n", |
727 | chan->number, chan->midi_program); | 727 | chan->number, chan->midi_program); |
728 | #endif | 728 | #endif |
729 | } | 729 | } |
@@ -812,7 +812,7 @@ void snd_opl3_control(void *p, int type, struct snd_midi_channel *chan) | |||
812 | 812 | ||
813 | opl3 = p; | 813 | opl3 = p; |
814 | #ifdef DEBUG_MIDI | 814 | #ifdef DEBUG_MIDI |
815 | snd_printk("Controller, TYPE = %i, ch#: %i, inst#: %i\n", | 815 | snd_printk(KERN_DEBUG "Controller, TYPE = %i, ch#: %i, inst#: %i\n", |
816 | type, chan->number, chan->midi_program); | 816 | type, chan->number, chan->midi_program); |
817 | #endif | 817 | #endif |
818 | 818 | ||
@@ -849,7 +849,7 @@ void snd_opl3_nrpn(void *p, struct snd_midi_channel *chan, | |||
849 | 849 | ||
850 | opl3 = p; | 850 | opl3 = p; |
851 | #ifdef DEBUG_MIDI | 851 | #ifdef DEBUG_MIDI |
852 | snd_printk("NRPN, ch#: %i, inst#: %i\n", | 852 | snd_printk(KERN_DEBUG "NRPN, ch#: %i, inst#: %i\n", |
853 | chan->number, chan->midi_program); | 853 | chan->number, chan->midi_program); |
854 | #endif | 854 | #endif |
855 | } | 855 | } |
@@ -864,6 +864,6 @@ void snd_opl3_sysex(void *p, unsigned char *buf, int len, | |||
864 | 864 | ||
865 | opl3 = p; | 865 | opl3 = p; |
866 | #ifdef DEBUG_MIDI | 866 | #ifdef DEBUG_MIDI |
867 | snd_printk("SYSEX\n"); | 867 | snd_printk(KERN_DEBUG "SYSEX\n"); |
868 | #endif | 868 | #endif |
869 | } | 869 | } |
diff --git a/sound/drivers/opl3/opl3_oss.c b/sound/drivers/opl3/opl3_oss.c index 9a2271dc046a..a54b1dc5cc78 100644 --- a/sound/drivers/opl3/opl3_oss.c +++ b/sound/drivers/opl3/opl3_oss.c | |||
@@ -220,14 +220,14 @@ static int snd_opl3_load_patch_seq_oss(struct snd_seq_oss_arg *arg, int format, | |||
220 | return -EINVAL; | 220 | return -EINVAL; |
221 | 221 | ||
222 | if (count < (int)sizeof(sbi)) { | 222 | if (count < (int)sizeof(sbi)) { |
223 | snd_printk("FM Error: Patch record too short\n"); | 223 | snd_printk(KERN_ERR "FM Error: Patch record too short\n"); |
224 | return -EINVAL; | 224 | return -EINVAL; |
225 | } | 225 | } |
226 | if (copy_from_user(&sbi, buf, sizeof(sbi))) | 226 | if (copy_from_user(&sbi, buf, sizeof(sbi))) |
227 | return -EFAULT; | 227 | return -EFAULT; |
228 | 228 | ||
229 | if (sbi.channel < 0 || sbi.channel >= SBFM_MAXINSTR) { | 229 | if (sbi.channel < 0 || sbi.channel >= SBFM_MAXINSTR) { |
230 | snd_printk("FM Error: Invalid instrument number %d\n", | 230 | snd_printk(KERN_ERR "FM Error: Invalid instrument number %d\n", |
231 | sbi.channel); | 231 | sbi.channel); |
232 | return -EINVAL; | 232 | return -EINVAL; |
233 | } | 233 | } |
@@ -254,7 +254,9 @@ static int snd_opl3_ioctl_seq_oss(struct snd_seq_oss_arg *arg, unsigned int cmd, | |||
254 | opl3 = arg->private_data; | 254 | opl3 = arg->private_data; |
255 | switch (cmd) { | 255 | switch (cmd) { |
256 | case SNDCTL_FM_LOAD_INSTR: | 256 | case SNDCTL_FM_LOAD_INSTR: |
257 | snd_printk("OPL3: Obsolete ioctl(SNDCTL_FM_LOAD_INSTR) used. Fix the program.\n"); | 257 | snd_printk(KERN_ERR "OPL3: " |
258 | "Obsolete ioctl(SNDCTL_FM_LOAD_INSTR) used. " | ||
259 | "Fix the program.\n"); | ||
258 | return -EINVAL; | 260 | return -EINVAL; |
259 | 261 | ||
260 | case SNDCTL_SYNTH_MEMAVL: | 262 | case SNDCTL_SYNTH_MEMAVL: |
diff --git a/sound/drivers/opl3/opl3_synth.c b/sound/drivers/opl3/opl3_synth.c index 962bb9c8b9c8..6d57b6441dec 100644 --- a/sound/drivers/opl3/opl3_synth.c +++ b/sound/drivers/opl3/opl3_synth.c | |||
@@ -168,7 +168,7 @@ int snd_opl3_ioctl(struct snd_hwdep * hw, struct file *file, | |||
168 | 168 | ||
169 | #ifdef CONFIG_SND_DEBUG | 169 | #ifdef CONFIG_SND_DEBUG |
170 | default: | 170 | default: |
171 | snd_printk("unknown IOCTL: 0x%x\n", cmd); | 171 | snd_printk(KERN_WARNING "unknown IOCTL: 0x%x\n", cmd); |
172 | #endif | 172 | #endif |
173 | } | 173 | } |
174 | return -ENOTTY; | 174 | return -ENOTTY; |