Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2ea7cfc authored by Takashi Iwai's avatar Takashi Iwai
Browse files

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



Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent e683ec46

sound/pci/ice1712/ice1712.c

+1 −1
Original line number Diff line number Diff line
@@ -458,7 +458,7 @@ static irqreturn_t snd_ice1712_interrupt(int irq, void *dev_id) 
			u16 pbkstatus;

			struct snd_pcm_substream *substream;

			pbkstatus = inw(ICEDS(ice, INTSTAT));

			/* printk("pbkstatus = 0x%x\n", pbkstatus); */

			/* printk(KERN_DEBUG "pbkstatus = 0x%x\n", pbkstatus); */

			for (idx = 0; idx < 6; idx++) {

				if ((pbkstatus & (3 << (idx * 2))) == 0)

					continue;

sound/pci/ice1712/ice1724.c

+14 −3
Original line number Diff line number Diff line
@@ -756,7 +756,14 @@ static int snd_vt1724_playback_pro_prepare(struct snd_pcm_substream *substream) 


	spin_unlock_irq(&ice->reg_lock);



	/* printk("pro prepare: ch = %d, addr = 0x%x, buffer = 0x%x, period = 0x%x\n", substream->runtime->channels, (unsigned int)substream->runtime->dma_addr, snd_pcm_lib_buffer_bytes(substream), snd_pcm_lib_period_bytes(substream)); */

	/*

	printk(KERN_DEBUG "pro prepare: ch = %d, addr = 0x%x, "

	       "buffer = 0x%x, period = 0x%x\n",

	       substream->runtime->channels,

	       (unsigned int)substream->runtime->dma_addr,

	       snd_pcm_lib_buffer_bytes(substream),

	       snd_pcm_lib_period_bytes(substream));

	*/

	return 0;

}
@@ -2133,7 +2140,9 @@ unsigned char snd_vt1724_read_i2c(struct snd_ice1712 *ice, 
	wait_i2c_busy(ice);

	val = inb(ICEREG1724(ice, I2C_DATA));

	mutex_unlock(&ice->i2c_mutex);

	/* printk("i2c_read: [0x%x,0x%x] = 0x%x\n", dev, addr, val); */

	/*

	printk(KERN_DEBUG "i2c_read: [0x%x,0x%x] = 0x%x\n", dev, addr, val);

	*/

	return val;

}
@@ -2142,7 +2151,9 @@ void snd_vt1724_write_i2c(struct snd_ice1712 *ice, 
{

	mutex_lock(&ice->i2c_mutex);

	wait_i2c_busy(ice);

	/* printk("i2c_write: [0x%x,0x%x] = 0x%x\n", dev, addr, data); */

	/*

	printk(KERN_DEBUG "i2c_write: [0x%x,0x%x] = 0x%x\n", dev, addr, data);

	*/

	outb(addr, ICEREG1724(ice, I2C_BYTE_ADDR));

	outb(data, ICEREG1724(ice, I2C_DATA));

	outb(dev | VT1724_I2C_WRITE, ICEREG1724(ice, I2C_DEV_ADDR));

sound/pci/ice1712/juli.c

+3 −2
Original line number Diff line number Diff line
@@ -345,8 +345,9 @@ static int juli_mute_put(struct snd_kcontrol *kcontrol, 
			new_gpio =  old_gpio &

				~((unsigned int) kcontrol->private_value);

	}

	/* printk("JULI - mute/unmute: control_value: 0x%x, old_gpio: 0x%x, \

		new_gpio 0x%x\n",

	/* printk(KERN_DEBUG

		"JULI - mute/unmute: control_value: 0x%x, old_gpio: 0x%x, "

		"new_gpio 0x%x\n",

		(unsigned int)ucontrol->value.integer.value[0], old_gpio,

		new_gpio); */

	if (old_gpio != new_gpio) {

sound/pci/ice1712/prodigy192.c

+9 −4
Original line number Diff line number Diff line
@@ -133,8 +133,10 @@ static int stac9460_dac_mute_put(struct snd_kcontrol *kcontrol, struct snd_ctl_e 
		idx  = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id) + STAC946X_LF_VOLUME;

	/* due to possible conflicts with stac9460_set_rate_val, mutexing */

	mutex_lock(&spec->mute_mutex);

	/*printk("Mute put: reg 0x%02x, ctrl value: 0x%02x\n", idx,

		ucontrol->value.integer.value[0]);*/

	/*

	printk(KERN_DEBUG "Mute put: reg 0x%02x, ctrl value: 0x%02x\n", idx,

	       ucontrol->value.integer.value[0]);

	*/

	change = stac9460_dac_mute(ice, idx, ucontrol->value.integer.value[0]);

	mutex_unlock(&spec->mute_mutex);

	return change;
@@ -185,7 +187,10 @@ static int stac9460_dac_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_el 
	change = (ovol != nvol);

	if (change) {

		ovol =  (0x7f - nvol) | (tmp & 0x80);

		/*printk("DAC Volume: reg 0x%02x: 0x%02x\n", idx, ovol);*/

		/*

		printk(KERN_DEBUG "DAC Volume: reg 0x%02x: 0x%02x\n",

		       idx, ovol);

		*/

		stac9460_put(ice, idx, (0x7f - nvol) | (tmp & 0x80));

	}

	return change;
@@ -344,7 +349,7 @@ static void stac9460_set_rate_val(struct snd_ice1712 *ice, unsigned int rate) 
	for (idx = 0; idx < 7 ; ++idx)

		changed[idx] = stac9460_dac_mute(ice,

				STAC946X_MASTER_VOLUME + idx, 0);

	/*printk("Rate change: %d, new MC: 0x%02x\n", rate, new);*/

	/*printk(KERN_DEBUG "Rate change: %d, new MC: 0x%02x\n", rate, new);*/

	stac9460_put(ice, STAC946X_MASTER_CLOCKING, new);

	udelay(10);

	/* unmuting - only originally unmuted dacs -