Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ALSA: Add missing KERN_* prefix to printk in sound/drivers

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

+48 -35
+7 -5
sound/drivers/mtpav.c
··· 303 303 304 304 snd_mtpav_send_byte(mtp_card, 0xf5); 305 305 snd_mtpav_send_byte(mtp_card, portp->hwport); 306 - //snd_printk("new outport: 0x%x\n", (unsigned int) portp->hwport); 307 - 306 + /* 307 + snd_printk(KERN_DEBUG "new outport: 0x%x\n", 308 + (unsigned int) portp->hwport); 309 + */ 308 310 if (!(outbyte & 0x80) && portp->running_status) 309 311 snd_mtpav_send_byte(mtp_card, portp->running_status); 310 312 } ··· 542 540 543 541 u8 sbyt = snd_mtpav_getreg(mcrd, SREG); 544 542 545 - //printk("snd_mtpav_read_bytes() sbyt: 0x%x\n", sbyt); 543 + /* printk(KERN_DEBUG "snd_mtpav_read_bytes() sbyt: 0x%x\n", sbyt); */ 546 544 547 545 if (!(sbyt & SIGS_BYTE)) 548 546 return; ··· 587 585 static int __devinit snd_mtpav_get_ISA(struct mtpav * mcard) 588 586 { 589 587 if ((mcard->res_port = request_region(port, 3, "MotuMTPAV MIDI")) == NULL) { 590 - snd_printk("MTVAP port 0x%lx is busy\n", port); 588 + snd_printk(KERN_ERR "MTVAP port 0x%lx is busy\n", port); 591 589 return -EBUSY; 592 590 } 593 591 mcard->port = port; 594 592 if (request_irq(irq, snd_mtpav_irqh, IRQF_DISABLED, "MOTU MTPAV", mcard)) { 595 - snd_printk("MTVAP IRQ %d busy\n", irq); 593 + snd_printk(KERN_ERR "MTVAP IRQ %d busy\n", irq); 596 594 return -EBUSY; 597 595 } 598 596 mcard->irq = irq;
+1 -1
sound/drivers/mts64.c
··· 1015 1015 goto __err; 1016 1016 } 1017 1017 1018 - snd_printk("ESI Miditerminal 4140 on 0x%lx\n", p->base); 1018 + snd_printk(KERN_INFO "ESI Miditerminal 4140 on 0x%lx\n", p->base); 1019 1019 return 0; 1020 1020 1021 1021 __err:
+1 -1
sound/drivers/opl3/opl3_lib.c
··· 302 302 opl3 = hw->private_data; 303 303 status = inb(opl3->l_port); 304 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 306 #endif 307 307 if (!(status & 0x80)) 308 308 return;
+15 -15
sound/drivers/opl3/opl3_midi.c
··· 125 125 int i; 126 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 129 for (i = 0; i < opl3->max_voices; i++) 130 130 printk("%c", *(str + opl3->voices[i].state + 1)); 131 131 printk("\n"); ··· 218 218 for (i = 0; i < END; i++) { 219 219 if (best[i].voice >= 0) { 220 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 222 alloc_type[i], instr_4op ? 4 : 2, 223 223 best[i].voice); 224 224 #endif ··· 317 317 opl3 = p; 318 318 319 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 321 chan->number, chan->midi_program, note, vel); 322 322 #endif 323 323 ··· 372 372 return; 373 373 } 374 374 #ifdef DEBUG_MIDI 375 - snd_printk(" --> OPL%i instrument: %s\n", 375 + snd_printk(KERN_DEBUG " --> OPL%i instrument: %s\n", 376 376 instr_4op ? 3 : 2, patch->name); 377 377 #endif 378 378 /* in SYNTH mode, application takes care of voices */ ··· 431 431 } 432 432 433 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 435 opl3->connection_reg); 436 436 #endif 437 437 /* ··· 466 466 /* Program the FM voice characteristics */ 467 467 for (i = 0; i < (instr_4op ? 4 : 2); i++) { 468 468 #ifdef DEBUG_MIDI 469 - snd_printk(" --> programming operator %i\n", i); 469 + snd_printk(KERN_DEBUG " --> programming operator %i\n", i); 470 470 #endif 471 471 op_offset = snd_opl3_regmap[voice_offset][i]; 472 472 ··· 546 546 blocknum |= OPL3_KEYON_BIT; 547 547 548 548 #ifdef DEBUG_MIDI 549 - snd_printk(" --> trigger voice %i\n", voice); 549 + snd_printk(KERN_DEBUG " --> trigger voice %i\n", voice); 550 550 #endif 551 551 /* Set OPL3 KEYON_BLOCK register of requested voice */ 552 552 opl3_reg = reg_side | (OPL3_REG_KEYON_BLOCK + voice_offset); ··· 602 602 prg = extra_prg - 1; 603 603 } 604 604 #ifdef DEBUG_MIDI 605 - snd_printk(" *** allocating extra program\n"); 605 + snd_printk(KERN_DEBUG " *** allocating extra program\n"); 606 606 #endif 607 607 goto __extra_prg; 608 608 } ··· 633 633 634 634 /* kill voice */ 635 635 #ifdef DEBUG_MIDI 636 - snd_printk(" --> kill voice %i\n", voice); 636 + snd_printk(KERN_DEBUG " --> kill voice %i\n", voice); 637 637 #endif 638 638 opl3_reg = reg_side | (OPL3_REG_KEYON_BLOCK + voice_offset); 639 639 /* clear Key ON bit */ ··· 670 670 opl3 = p; 671 671 672 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 674 chan->number, chan->midi_program, note); 675 675 #endif 676 676 ··· 709 709 710 710 opl3 = p; 711 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 713 chan->number, chan->midi_program); 714 714 #endif 715 715 } ··· 723 723 724 724 opl3 = p; 725 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 727 chan->number, chan->midi_program); 728 728 #endif 729 729 } ··· 812 812 813 813 opl3 = p; 814 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 816 type, chan->number, chan->midi_program); 817 817 #endif 818 818 ··· 849 849 850 850 opl3 = p; 851 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 853 chan->number, chan->midi_program); 854 854 #endif 855 855 } ··· 864 864 865 865 opl3 = p; 866 866 #ifdef DEBUG_MIDI 867 - snd_printk("SYSEX\n"); 867 + snd_printk(KERN_DEBUG "SYSEX\n"); 868 868 #endif 869 869 }
+5 -3
sound/drivers/opl3/opl3_oss.c
··· 220 220 return -EINVAL; 221 221 222 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 224 return -EINVAL; 225 225 } 226 226 if (copy_from_user(&sbi, buf, sizeof(sbi))) 227 227 return -EFAULT; 228 228 229 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 231 sbi.channel); 232 232 return -EINVAL; 233 233 } ··· 254 254 opl3 = arg->private_data; 255 255 switch (cmd) { 256 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 260 return -EINVAL; 259 261 260 262 case SNDCTL_SYNTH_MEMAVL:
+1 -1
sound/drivers/opl3/opl3_synth.c
··· 168 168 169 169 #ifdef CONFIG_SND_DEBUG 170 170 default: 171 - snd_printk("unknown IOCTL: 0x%x\n", cmd); 171 + snd_printk(KERN_WARNING "unknown IOCTL: 0x%x\n", cmd); 172 172 #endif 173 173 } 174 174 return -ENOTTY;
+1 -1
sound/drivers/pcsp/pcsp.c
··· 57 57 else 58 58 min_div = MAX_DIV; 59 59 #if PCSP_DEBUG 60 - printk("PCSP: lpj=%li, min_div=%i, res=%li\n", 60 + printk(KERN_DEBUG "PCSP: lpj=%li, min_div=%i, res=%li\n", 61 61 loops_per_jiffy, min_div, tp.tv_nsec); 62 62 #endif 63 63
+12 -6
sound/drivers/serial-u16550.c
··· 241 241 snd_rawmidi_receive(uart->midi_input[substream], &c, 1); 242 242 243 243 if (status & UART_LSR_OE) 244 - snd_printk("%s: Overrun on device at 0x%lx\n", 244 + snd_printk(KERN_WARNING 245 + "%s: Overrun on device at 0x%lx\n", 245 246 uart->rmidi->name, uart->base); 246 247 } 247 248 ··· 637 636 } 638 637 } else { 639 638 if (!snd_uart16550_write_buffer(uart, midi_byte)) { 640 - snd_printk("%s: Buffer overrun on device at 0x%lx\n", 639 + snd_printk(KERN_WARNING 640 + "%s: Buffer overrun on device at 0x%lx\n", 641 641 uart->rmidi->name, uart->base); 642 642 return 0; 643 643 } ··· 817 815 if (irq >= 0 && irq != SNDRV_AUTO_IRQ) { 818 816 if (request_irq(irq, snd_uart16550_interrupt, 819 817 IRQF_DISABLED, "Serial MIDI", uart)) { 820 - snd_printk("irq %d busy. Using Polling.\n", irq); 818 + snd_printk(KERN_WARNING 819 + "irq %d busy. Using Polling.\n", irq); 821 820 } else { 822 821 uart->irq = irq; 823 822 } ··· 922 919 case SNDRV_SERIAL_GENERIC: 923 920 break; 924 921 default: 925 - snd_printk("Adaptor type is out of range 0-%d (%d)\n", 922 + snd_printk(KERN_ERR 923 + "Adaptor type is out of range 0-%d (%d)\n", 926 924 SNDRV_SERIAL_MAX_ADAPTOR, adaptor[dev]); 927 925 return -ENODEV; 928 926 } 929 927 930 928 if (outs[dev] < 1 || outs[dev] > SNDRV_SERIAL_MAX_OUTS) { 931 - snd_printk("Count of outputs is out of range 1-%d (%d)\n", 929 + snd_printk(KERN_ERR 930 + "Count of outputs is out of range 1-%d (%d)\n", 932 931 SNDRV_SERIAL_MAX_OUTS, outs[dev]); 933 932 return -ENODEV; 934 933 } 935 934 936 935 if (ins[dev] < 1 || ins[dev] > SNDRV_SERIAL_MAX_INS) { 937 - snd_printk("Count of inputs is out of range 1-%d (%d)\n", 936 + snd_printk(KERN_ERR 937 + "Count of inputs is out of range 1-%d (%d)\n", 938 938 SNDRV_SERIAL_MAX_INS, ins[dev]); 939 939 return -ENODEV; 940 940 }
+3 -1
sound/drivers/virmidi.c
··· 98 98 vmidi->card = card; 99 99 100 100 if (midi_devs[dev] > MAX_MIDI_DEVICES) { 101 - snd_printk("too much midi devices for virmidi %d: force to use %d\n", dev, MAX_MIDI_DEVICES); 101 + snd_printk(KERN_WARNING 102 + "too much midi devices for virmidi %d: " 103 + "force to use %d\n", dev, MAX_MIDI_DEVICES); 102 104 midi_devs[dev] = MAX_MIDI_DEVICES; 103 105 } 104 106 for (idx = 0; idx < midi_devs[dev]; idx++) {
+2 -1
sound/drivers/vx/vx_core.c
··· 688 688 image = dsp->data + i; 689 689 /* Wait DSP ready for a new read */ 690 690 if ((err = vx_wait_isr_bit(chip, ISR_TX_EMPTY)) < 0) { 691 - printk("dsp loading error at position %d\n", i); 691 + printk(KERN_ERR 692 + "dsp loading error at position %d\n", i); 692 693 return err; 693 694 } 694 695 cptr = image;