ALSA: Add missing KERN_* prefix to printk in sound/drivers (45203832) · Commits · e / devices / android_kernel_teracube_2e

sound/drivers/mtpav.c

+7 −5

Original line number	Diff line number	Diff line
		@@ -303,8 +303,10 @@ static void snd_mtpav_output_port_write(struct mtpav *mtp_card,

		snd_mtpav_send_byte(mtp_card, 0xf5);
		snd_mtpav_send_byte(mtp_card, portp->hwport);
		//snd_printk("new outport: 0x%x\n", (unsigned int) portp->hwport);

		/*
		snd_printk(KERN_DEBUG "new outport: 0x%x\n",
		(unsigned int) portp->hwport);
		*/
		if (!(outbyte & 0x80) && portp->running_status)
		snd_mtpav_send_byte(mtp_card, portp->running_status);
		}
		@@ -540,7 +542,7 @@ static void snd_mtpav_read_bytes(struct mtpav *mcrd)

		u8 sbyt = snd_mtpav_getreg(mcrd, SREG);

		//printk("snd_mtpav_read_bytes() sbyt: 0x%x\n", sbyt);
		/* printk(KERN_DEBUG "snd_mtpav_read_bytes() sbyt: 0x%x\n", sbyt); */

		if (!(sbyt & SIGS_BYTE))
		return;
		@@ -585,12 +587,12 @@ static irqreturn_t snd_mtpav_irqh(int irq, void *dev_id)
		static int __devinit snd_mtpav_get_ISA(struct mtpav * mcard)
		{
		if ((mcard->res_port = request_region(port, 3, "MotuMTPAV MIDI")) == NULL) {
		snd_printk("MTVAP port 0x%lx is busy\n", port);
		snd_printk(KERN_ERR "MTVAP port 0x%lx is busy\n", port);
		return -EBUSY;
		}
		mcard->port = port;
		if (request_irq(irq, snd_mtpav_irqh, IRQF_DISABLED, "MOTU MTPAV", mcard)) {
		snd_printk("MTVAP IRQ %d busy\n", irq);
		snd_printk(KERN_ERR "MTVAP IRQ %d busy\n", irq);
		return -EBUSY;
		}
		mcard->irq = irq;

sound/drivers/mts64.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1015,7 +1015,7 @@ static int __devinit snd_mts64_probe(struct platform_device *pdev)
		goto __err;
		}

		snd_printk("ESI Miditerminal 4140 on 0x%lx\n", p->base);
		snd_printk(KERN_INFO "ESI Miditerminal 4140 on 0x%lx\n", p->base);
		return 0;

		__err:

sound/drivers/opl3/opl3_lib.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -302,7 +302,7 @@ void snd_opl3_interrupt(struct snd_hwdep * hw)
		opl3 = hw->private_data;
		status = inb(opl3->l_port);
		#if 0
		snd_printk("AdLib IRQ status = 0x%x\n", status);
		snd_printk(KERN_DEBUG "AdLib IRQ status = 0x%x\n", status);
		#endif
		if (!(status & 0x80))
		return;

sound/drivers/opl3/opl3_midi.c

+15 −15

Original line number	Diff line number	Diff line
		@@ -125,7 +125,7 @@ static void debug_alloc(struct snd_opl3 opl3, char s, int voice) {
		int i;
		char *str = "x.24";

		printk("time %.5i: %s [%.2i]: ", opl3->use_time, s, voice);
		printk(KERN_DEBUG "time %.5i: %s [%.2i]: ", opl3->use_time, s, voice);
		for (i = 0; i < opl3->max_voices; i++)
		printk("%c", *(str + opl3->voices[i].state + 1));
		printk("\n");
		@@ -218,7 +218,7 @@ static int opl3_get_voice(struct snd_opl3 *opl3, int instr_4op,
		for (i = 0; i < END; i++) {
		if (best[i].voice >= 0) {
		#ifdef DEBUG_ALLOC
		printk("%s %iop allocation on voice %i\n",
		printk(KERN_DEBUG "%s %iop allocation on voice %i\n",
		alloc_type[i], instr_4op ? 4 : 2,
		best[i].voice);
		#endif
		@@ -317,7 +317,7 @@ void snd_opl3_note_on(void p, int note, int vel, struct snd_midi_channel chan)
		opl3 = p;

		#ifdef DEBUG_MIDI
		snd_printk("Note on, ch %i, inst %i, note %i, vel %i\n",
		snd_printk(KERN_DEBUG "Note on, ch %i, inst %i, note %i, vel %i\n",
		chan->number, chan->midi_program, note, vel);
		#endif

		@@ -372,7 +372,7 @@ void snd_opl3_note_on(void p, int note, int vel, struct snd_midi_channel chan)
		return;
		}
		#ifdef DEBUG_MIDI
		snd_printk(" --> OPL%i instrument: %s\n",
		snd_printk(KERN_DEBUG " --> OPL%i instrument: %s\n",
		instr_4op ? 3 : 2, patch->name);
		#endif
		/* 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)
		}

		#ifdef DEBUG_MIDI
		snd_printk(" --> setting OPL3 connection: 0x%x\n",
		snd_printk(KERN_DEBUG " --> setting OPL3 connection: 0x%x\n",
		opl3->connection_reg);
		#endif
		/*
		@@ -466,7 +466,7 @@ void snd_opl3_note_on(void p, int note, int vel, struct snd_midi_channel chan)
		/* Program the FM voice characteristics */
		for (i = 0; i < (instr_4op ? 4 : 2); i++) {
		#ifdef DEBUG_MIDI
		snd_printk(" --> programming operator %i\n", i);
		snd_printk(KERN_DEBUG " --> programming operator %i\n", i);
		#endif
		op_offset = snd_opl3_regmap[voice_offset][i];

		@@ -546,7 +546,7 @@ void snd_opl3_note_on(void p, int note, int vel, struct snd_midi_channel chan)
		blocknum \|= OPL3_KEYON_BIT;

		#ifdef DEBUG_MIDI
		snd_printk(" --> trigger voice %i\n", voice);
		snd_printk(KERN_DEBUG " --> trigger voice %i\n", voice);
		#endif
		/* Set OPL3 KEYON_BLOCK register of requested voice */
		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)
		prg = extra_prg - 1;
		}
		#ifdef DEBUG_MIDI
		snd_printk(" *** allocating extra program\n");
		snd_printk(KERN_DEBUG " *** allocating extra program\n");
		#endif
		goto __extra_prg;
		}
		@@ -633,7 +633,7 @@ static void snd_opl3_kill_voice(struct snd_opl3 *opl3, int voice)

		/* kill voice */
		#ifdef DEBUG_MIDI
		snd_printk(" --> kill voice %i\n", voice);
		snd_printk(KERN_DEBUG " --> kill voice %i\n", voice);
		#endif
		opl3_reg = reg_side \| (OPL3_REG_KEYON_BLOCK + voice_offset);
		/* clear Key ON bit */
		@@ -670,7 +670,7 @@ void snd_opl3_note_off(void p, int note, int vel, struct snd_midi_channel chan
		opl3 = p;

		#ifdef DEBUG_MIDI
		snd_printk("Note off, ch %i, inst %i, note %i\n",
		snd_printk(KERN_DEBUG "Note off, ch %i, inst %i, note %i\n",
		chan->number, chan->midi_program, note);
		#endif

		@@ -709,7 +709,7 @@ void snd_opl3_key_press(void p, int note, int vel, struct snd_midi_channel cha

		opl3 = p;
		#ifdef DEBUG_MIDI
		snd_printk("Key pressure, ch#: %i, inst#: %i\n",
		snd_printk(KERN_DEBUG "Key pressure, ch#: %i, inst#: %i\n",
		chan->number, chan->midi_program);
		#endif
		}
		@@ -723,7 +723,7 @@ void snd_opl3_terminate_note(void p, int note, struct snd_midi_channel chan)

		opl3 = p;
		#ifdef DEBUG_MIDI
		snd_printk("Terminate note, ch#: %i, inst#: %i\n",
		snd_printk(KERN_DEBUG "Terminate note, ch#: %i, inst#: %i\n",
		chan->number, chan->midi_program);
		#endif
		}
		@@ -812,7 +812,7 @@ void snd_opl3_control(void p, int type, struct snd_midi_channel chan)

		opl3 = p;
		#ifdef DEBUG_MIDI
		snd_printk("Controller, TYPE = %i, ch#: %i, inst#: %i\n",
		snd_printk(KERN_DEBUG "Controller, TYPE = %i, ch#: %i, inst#: %i\n",
		type, chan->number, chan->midi_program);
		#endif

		@@ -849,7 +849,7 @@ void snd_opl3_nrpn(void p, struct snd_midi_channel chan,

		opl3 = p;
		#ifdef DEBUG_MIDI
		snd_printk("NRPN, ch#: %i, inst#: %i\n",
		snd_printk(KERN_DEBUG "NRPN, ch#: %i, inst#: %i\n",
		chan->number, chan->midi_program);
		#endif
		}
		@@ -864,6 +864,6 @@ void snd_opl3_sysex(void p, unsigned char buf, int len,

		opl3 = p;
		#ifdef DEBUG_MIDI
		snd_printk("SYSEX\n");
		snd_printk(KERN_DEBUG "SYSEX\n");
		#endif
		}

sound/drivers/opl3/opl3_oss.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -220,14 +220,14 @@ static int snd_opl3_load_patch_seq_oss(struct snd_seq_oss_arg *arg, int format,
		return -EINVAL;

		if (count < (int)sizeof(sbi)) {
		snd_printk("FM Error: Patch record too short\n");
		snd_printk(KERN_ERR "FM Error: Patch record too short\n");
		return -EINVAL;
		}
		if (copy_from_user(&sbi, buf, sizeof(sbi)))
		return -EFAULT;

		if (sbi.channel < 0 \|\| sbi.channel >= SBFM_MAXINSTR) {
		snd_printk("FM Error: Invalid instrument number %d\n",
		snd_printk(KERN_ERR "FM Error: Invalid instrument number %d\n",
		sbi.channel);
		return -EINVAL;
		}
		@@ -254,7 +254,9 @@ static int snd_opl3_ioctl_seq_oss(struct snd_seq_oss_arg *arg, unsigned int cmd,
		opl3 = arg->private_data;
		switch (cmd) {
		case SNDCTL_FM_LOAD_INSTR:
		snd_printk("OPL3: Obsolete ioctl(SNDCTL_FM_LOAD_INSTR) used. Fix the program.\n");
		snd_printk(KERN_ERR "OPL3: "
		"Obsolete ioctl(SNDCTL_FM_LOAD_INSTR) used. "
		"Fix the program.\n");
		return -EINVAL;

		case SNDCTL_SYNTH_MEMAVL: