ALSA: gus - Add missing KERN_* prefix to printk (91f05060) · Commits · e / devices / android_kernel_xiaomi_markw

sound/isa/gus/gus_dma.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -78,7 +78,8 @@ static void snd_gf1_dma_program(struct snd_gus_card * gus,
		snd_gf1_dma_ack(gus);
		snd_dma_program(gus->gf1.dma1, buf_addr, count, dma_cmd & SNDRV_GF1_DMA_READ ? DMA_MODE_READ : DMA_MODE_WRITE);
		#if 0
		snd_printk("address = 0x%x, count = 0x%x, dma_cmd = 0x%x\n", address << 1, count, dma_cmd);
		snd_printk(KERN_DEBUG "address = 0x%x, count = 0x%x, dma_cmd = 0x%x\n",
		address << 1, count, dma_cmd);
		#endif
		spin_lock_irqsave(&gus->reg_lock, flags);
		if (gus->gf1.enh_mode) {

sound/isa/gus/gus_irq.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@ __again:
		if (status == 0)
		return IRQ_RETVAL(handled);
		handled = 1;
		// snd_printk("IRQ: status = 0x%x\n", status);
		/* snd_printk(KERN_DEBUG "IRQ: status = 0x%x\n", status); */
		if (status & 0x02) {
		STAT_ADD(gus->gf1.interrupt_stat_midi_in);
		if (gus->gf1.interrupt_handler_midi_in)
		@@ -65,7 +65,9 @@ __again:
		continue; /* multi request */
		already \|= _current_; /* mark request */
		#if 0
		printk("voice = %i, voice_status = 0x%x, voice_verify = %i\n", voice, voice_status, inb(GUSP(gus, GF1PAGE)));
		printk(KERN_DEBUG "voice = %i, voice_status = 0x%x, "
		"voice_verify = %i\n",
		voice, voice_status, inb(GUSP(gus, GF1PAGE)));
		#endif
		pvoice = &gus->gf1.voices[voice];
		if (pvoice->use) {

sound/isa/gus/gus_pcm.c

+20 −6

Original line number	Diff line number	Diff line
		@@ -82,7 +82,10 @@ static int snd_gf1_pcm_block_change(struct snd_pcm_substream *substream,

		count += offset & 31;
		offset &= ~31;
		// snd_printk("block change - offset = 0x%x, count = 0x%x\n", offset, count);
		/*
		snd_printk(KERN_DEBUG "block change - offset = 0x%x, count = 0x%x\n",
		offset, count);
		*/
		memset(&block, 0, sizeof(block));
		block.cmd = SNDRV_GF1_DMA_IRQ;
		if (snd_pcm_format_unsigned(runtime->format))
		@@ -135,7 +138,11 @@ static void snd_gf1_pcm_trigger_up(struct snd_pcm_substream *substream)
		curr = begin + (pcmp->bpos * pcmp->block_size) / runtime->channels;
		end = curr + (pcmp->block_size / runtime->channels);
		end -= snd_pcm_format_width(runtime->format) == 16 ? 2 : 1;
		// snd_printk("init: curr=0x%x, begin=0x%x, end=0x%x, ctrl=0x%x, ramp=0x%x, rate=0x%x\n", curr, begin, end, voice_ctrl, ramp_ctrl, rate);
		/*
		snd_printk(KERN_DEBUG "init: curr=0x%x, begin=0x%x, end=0x%x, "
		"ctrl=0x%x, ramp=0x%x, rate=0x%x\n",
		curr, begin, end, voice_ctrl, ramp_ctrl, rate);
		*/
		pan = runtime->channels == 2 ? (!voice ? 1 : 14) : 8;
		vol = !voice ? gus->gf1.pcm_volume_level_left : gus->gf1.pcm_volume_level_right;
		spin_lock_irqsave(&gus->reg_lock, flags);
		@@ -205,9 +212,11 @@ static void snd_gf1_pcm_interrupt_wave(struct snd_gus_card * gus,
		ramp_ctrl = (snd_gf1_read8(gus, SNDRV_GF1_VB_VOLUME_CONTROL) & ~0xa4) \| 0x03;
		#if 0
		snd_gf1_select_voice(gus, pvoice->number);
		printk("position = 0x%x\n", (snd_gf1_read_addr(gus, SNDRV_GF1_VA_CURRENT, voice_ctrl & 4) >> 4));
		printk(KERN_DEBUG "position = 0x%x\n",
		(snd_gf1_read_addr(gus, SNDRV_GF1_VA_CURRENT, voice_ctrl & 4) >> 4));
		snd_gf1_select_voice(gus, pcmp->pvoices[1]->number);
		printk("position = 0x%x\n", (snd_gf1_read_addr(gus, SNDRV_GF1_VA_CURRENT, voice_ctrl & 4) >> 4));
		printk(KERN_DEBUG "position = 0x%x\n",
		(snd_gf1_read_addr(gus, SNDRV_GF1_VA_CURRENT, voice_ctrl & 4) >> 4));
		snd_gf1_select_voice(gus, pvoice->number);
		#endif
		pcmp->bpos++;
		@@ -299,7 +308,11 @@ static int snd_gf1_pcm_poke_block(struct snd_gus_card gus, unsigned char buf,
		unsigned int len;
		unsigned long flags;

		// printk("poke block; buf = 0x%x, pos = %i, count = %i, port = 0x%x\n", (int)buf, pos, count, gus->gf1.port);
		/*
		printk(KERN_DEBUG
		"poke block; buf = 0x%x, pos = %i, count = %i, port = 0x%x\n",
		(int)buf, pos, count, gus->gf1.port);
		*/
		while (count > 0) {
		len = count;
		if (len > 512) /* limit, to allow IRQ */
		@@ -680,7 +693,8 @@ static int snd_gf1_pcm_playback_open(struct snd_pcm_substream *substream)
		runtime->private_free = snd_gf1_pcm_playback_free;

		#if 0
		printk("playback.buffer = 0x%lx, gf1.pcm_buffer = 0x%lx\n", (long) pcm->playback.buffer, (long) gus->gf1.pcm_buffer);
		printk(KERN_DEBUG "playback.buffer = 0x%lx, gf1.pcm_buffer = 0x%lx\n",
		(long) pcm->playback.buffer, (long) gus->gf1.pcm_buffer);
		#endif
		if ((err = snd_gf1_dma_init(gus)) < 0)
		return err;

sound/isa/gus/gus_uart.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -129,8 +129,14 @@ static int snd_gf1_uart_input_open(struct snd_rawmidi_substream *substream)
		}
		spin_unlock_irqrestore(&gus->uart_cmd_lock, flags);
		#if 0
		snd_printk("read init - enable = %i, cmd = 0x%x, stat = 0x%x\n", gus->uart_enable, gus->gf1.uart_cmd, snd_gf1_uart_stat(gus));
		snd_printk("[0x%x] reg (ctrl/status) = 0x%x, reg (data) = 0x%x (page = 0x%x)\n", gus->gf1.port + 0x100, inb(gus->gf1.port + 0x100), inb(gus->gf1.port + 0x101), inb(gus->gf1.port + 0x102));
		snd_printk(KERN_DEBUG
		"read init - enable = %i, cmd = 0x%x, stat = 0x%x\n",
		gus->uart_enable, gus->gf1.uart_cmd, snd_gf1_uart_stat(gus));
		snd_printk(KERN_DEBUG
		"[0x%x] reg (ctrl/status) = 0x%x, reg (data) = 0x%x "
		"(page = 0x%x)\n",
		gus->gf1.port + 0x100, inb(gus->gf1.port + 0x100),
		inb(gus->gf1.port + 0x101), inb(gus->gf1.port + 0x102));
		#endif
		return 0;
		}

sound/isa/gus/interwave.c

+9 −7

Original line number	Diff line number	Diff line
		@@ -170,7 +170,7 @@ static void snd_interwave_i2c_setlines(struct snd_i2c_bus *bus, int ctrl, int da
		unsigned long port = bus->private_value;

		#if 0
		printk("i2c_setlines - 0x%lx <- %i,%i\n", port, ctrl, data);
		printk(KERN_DEBUG "i2c_setlines - 0x%lx <- %i,%i\n", port, ctrl, data);
		#endif
		outb((data << 1) \| ctrl, port);
		udelay(10);
		@@ -183,7 +183,7 @@ static int snd_interwave_i2c_getclockline(struct snd_i2c_bus *bus)

		res = inb(port) & 1;
		#if 0
		printk("i2c_getclockline - 0x%lx -> %i\n", port, res);
		printk(KERN_DEBUG "i2c_getclockline - 0x%lx -> %i\n", port, res);
		#endif
		return res;
		}
		@@ -197,7 +197,7 @@ static int snd_interwave_i2c_getdataline(struct snd_i2c_bus *bus, int ack)
		udelay(10);
		res = (inb(port) & 2) >> 1;
		#if 0
		printk("i2c_getdataline - 0x%lx -> %i\n", port, res);
		printk(KERN_DEBUG "i2c_getdataline - 0x%lx -> %i\n", port, res);
		#endif
		return res;
		}
		@@ -342,7 +342,8 @@ static void __devinit snd_interwave_bank_sizes(struct snd_gus_card * gus, int *s
		snd_gf1_poke(gus, local, d);
		snd_gf1_poke(gus, local + 1, d + 1);
		#if 0
		printk("d = 0x%x, local = 0x%x, local + 1 = 0x%x, idx << 22 = 0x%x\n",
		printk(KERN_DEBUG "d = 0x%x, local = 0x%x, "
		"local + 1 = 0x%x, idx << 22 = 0x%x\n",
		d,
		snd_gf1_peek(gus, local),
		snd_gf1_peek(gus, local + 1),
		@@ -356,7 +357,8 @@ static void __devinit snd_interwave_bank_sizes(struct snd_gus_card * gus, int *s
		}
		}
		#if 0
		printk("sizes: %i %i %i %i\n", sizes[0], sizes[1], sizes[2], sizes[3]);
		printk(KERN_DEBUG "sizes: %i %i %i %i\n",
		sizes[0], sizes[1], sizes[2], sizes[3]);
		#endif
		}

		@@ -410,12 +412,12 @@ static void __devinit snd_interwave_detect_memory(struct snd_gus_card * gus)
		lmct = (psizes[3] << 24) \| (psizes[2] << 16) \|
		(psizes[1] << 8) \| psizes[0];
		#if 0
		printk("lmct = 0x%08x\n", lmct);
		printk(KERN_DEBUG "lmct = 0x%08x\n", lmct);
		#endif
		for (i = 0; i < ARRAY_SIZE(lmc); i++)
		if (lmct == lmc[i]) {
		#if 0
		printk("found !!! %i\n", i);
		printk(KERN_DEBUG "found !!! %i\n", i);
		#endif
		snd_gf1_write16(gus, SNDRV_GF1_GW_MEMORY_CONFIG, (snd_gf1_look16(gus, SNDRV_GF1_GW_MEMORY_CONFIG) & 0xfff0) \| i);
		snd_interwave_bank_sizes(gus, psizes);