diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-02-05 10:07:02 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-02-05 10:07:02 -0500 |
commit | e2ea7cfc703cba3299d22db728516a0fc1a9717c (patch) | |
tree | 05439eb885aa02cd27c5cc31ac15aa86bed35270 | |
parent | e683ec4697c74c7d04ff8e90ec625ac34e25a7d8 (diff) |
ALSA: Add missing KERN_* prefix to printk in sound/pci/ice1712
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/pci/ice1712/ice1712.c | 2 | ||||
-rw-r--r-- | sound/pci/ice1712/ice1724.c | 17 | ||||
-rw-r--r-- | sound/pci/ice1712/juli.c | 5 | ||||
-rw-r--r-- | sound/pci/ice1712/prodigy192.c | 13 |
4 files changed, 27 insertions, 10 deletions
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c index 58d7cda03de5..dcd3f4f89b44 100644 --- a/sound/pci/ice1712/ice1712.c +++ b/sound/pci/ice1712/ice1712.c | |||
@@ -458,7 +458,7 @@ static irqreturn_t snd_ice1712_interrupt(int irq, void *dev_id) | |||
458 | u16 pbkstatus; | 458 | u16 pbkstatus; |
459 | struct snd_pcm_substream *substream; | 459 | struct snd_pcm_substream *substream; |
460 | pbkstatus = inw(ICEDS(ice, INTSTAT)); | 460 | pbkstatus = inw(ICEDS(ice, INTSTAT)); |
461 | /* printk("pbkstatus = 0x%x\n", pbkstatus); */ | 461 | /* printk(KERN_DEBUG "pbkstatus = 0x%x\n", pbkstatus); */ |
462 | for (idx = 0; idx < 6; idx++) { | 462 | for (idx = 0; idx < 6; idx++) { |
463 | if ((pbkstatus & (3 << (idx * 2))) == 0) | 463 | if ((pbkstatus & (3 << (idx * 2))) == 0) |
464 | continue; | 464 | continue; |
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c index eb7872dec5ae..da8c111e9e39 100644 --- a/sound/pci/ice1712/ice1724.c +++ b/sound/pci/ice1712/ice1724.c | |||
@@ -756,7 +756,14 @@ static int snd_vt1724_playback_pro_prepare(struct snd_pcm_substream *substream) | |||
756 | 756 | ||
757 | spin_unlock_irq(&ice->reg_lock); | 757 | spin_unlock_irq(&ice->reg_lock); |
758 | 758 | ||
759 | /* 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)); */ | 759 | /* |
760 | printk(KERN_DEBUG "pro prepare: ch = %d, addr = 0x%x, " | ||
761 | "buffer = 0x%x, period = 0x%x\n", | ||
762 | substream->runtime->channels, | ||
763 | (unsigned int)substream->runtime->dma_addr, | ||
764 | snd_pcm_lib_buffer_bytes(substream), | ||
765 | snd_pcm_lib_period_bytes(substream)); | ||
766 | */ | ||
760 | return 0; | 767 | return 0; |
761 | } | 768 | } |
762 | 769 | ||
@@ -2133,7 +2140,9 @@ unsigned char snd_vt1724_read_i2c(struct snd_ice1712 *ice, | |||
2133 | wait_i2c_busy(ice); | 2140 | wait_i2c_busy(ice); |
2134 | val = inb(ICEREG1724(ice, I2C_DATA)); | 2141 | val = inb(ICEREG1724(ice, I2C_DATA)); |
2135 | mutex_unlock(&ice->i2c_mutex); | 2142 | mutex_unlock(&ice->i2c_mutex); |
2136 | /* printk("i2c_read: [0x%x,0x%x] = 0x%x\n", dev, addr, val); */ | 2143 | /* |
2144 | printk(KERN_DEBUG "i2c_read: [0x%x,0x%x] = 0x%x\n", dev, addr, val); | ||
2145 | */ | ||
2137 | return val; | 2146 | return val; |
2138 | } | 2147 | } |
2139 | 2148 | ||
@@ -2142,7 +2151,9 @@ void snd_vt1724_write_i2c(struct snd_ice1712 *ice, | |||
2142 | { | 2151 | { |
2143 | mutex_lock(&ice->i2c_mutex); | 2152 | mutex_lock(&ice->i2c_mutex); |
2144 | wait_i2c_busy(ice); | 2153 | wait_i2c_busy(ice); |
2145 | /* printk("i2c_write: [0x%x,0x%x] = 0x%x\n", dev, addr, data); */ | 2154 | /* |
2155 | printk(KERN_DEBUG "i2c_write: [0x%x,0x%x] = 0x%x\n", dev, addr, data); | ||
2156 | */ | ||
2146 | outb(addr, ICEREG1724(ice, I2C_BYTE_ADDR)); | 2157 | outb(addr, ICEREG1724(ice, I2C_BYTE_ADDR)); |
2147 | outb(data, ICEREG1724(ice, I2C_DATA)); | 2158 | outb(data, ICEREG1724(ice, I2C_DATA)); |
2148 | outb(dev | VT1724_I2C_WRITE, ICEREG1724(ice, I2C_DEV_ADDR)); | 2159 | outb(dev | VT1724_I2C_WRITE, ICEREG1724(ice, I2C_DEV_ADDR)); |
diff --git a/sound/pci/ice1712/juli.c b/sound/pci/ice1712/juli.c index c51659b9caf6..fd948bfd9aef 100644 --- a/sound/pci/ice1712/juli.c +++ b/sound/pci/ice1712/juli.c | |||
@@ -345,8 +345,9 @@ static int juli_mute_put(struct snd_kcontrol *kcontrol, | |||
345 | new_gpio = old_gpio & | 345 | new_gpio = old_gpio & |
346 | ~((unsigned int) kcontrol->private_value); | 346 | ~((unsigned int) kcontrol->private_value); |
347 | } | 347 | } |
348 | /* printk("JULI - mute/unmute: control_value: 0x%x, old_gpio: 0x%x, \ | 348 | /* printk(KERN_DEBUG |
349 | new_gpio 0x%x\n", | 349 | "JULI - mute/unmute: control_value: 0x%x, old_gpio: 0x%x, " |
350 | "new_gpio 0x%x\n", | ||
350 | (unsigned int)ucontrol->value.integer.value[0], old_gpio, | 351 | (unsigned int)ucontrol->value.integer.value[0], old_gpio, |
351 | new_gpio); */ | 352 | new_gpio); */ |
352 | if (old_gpio != new_gpio) { | 353 | if (old_gpio != new_gpio) { |
diff --git a/sound/pci/ice1712/prodigy192.c b/sound/pci/ice1712/prodigy192.c index 48d3679292a7..2a8e5cd8f2d8 100644 --- a/sound/pci/ice1712/prodigy192.c +++ b/sound/pci/ice1712/prodigy192.c | |||
@@ -133,8 +133,10 @@ static int stac9460_dac_mute_put(struct snd_kcontrol *kcontrol, struct snd_ctl_e | |||
133 | idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id) + STAC946X_LF_VOLUME; | 133 | idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id) + STAC946X_LF_VOLUME; |
134 | /* due to possible conflicts with stac9460_set_rate_val, mutexing */ | 134 | /* due to possible conflicts with stac9460_set_rate_val, mutexing */ |
135 | mutex_lock(&spec->mute_mutex); | 135 | mutex_lock(&spec->mute_mutex); |
136 | /*printk("Mute put: reg 0x%02x, ctrl value: 0x%02x\n", idx, | 136 | /* |
137 | ucontrol->value.integer.value[0]);*/ | 137 | printk(KERN_DEBUG "Mute put: reg 0x%02x, ctrl value: 0x%02x\n", idx, |
138 | ucontrol->value.integer.value[0]); | ||
139 | */ | ||
138 | change = stac9460_dac_mute(ice, idx, ucontrol->value.integer.value[0]); | 140 | change = stac9460_dac_mute(ice, idx, ucontrol->value.integer.value[0]); |
139 | mutex_unlock(&spec->mute_mutex); | 141 | mutex_unlock(&spec->mute_mutex); |
140 | return change; | 142 | return change; |
@@ -185,7 +187,10 @@ static int stac9460_dac_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_el | |||
185 | change = (ovol != nvol); | 187 | change = (ovol != nvol); |
186 | if (change) { | 188 | if (change) { |
187 | ovol = (0x7f - nvol) | (tmp & 0x80); | 189 | ovol = (0x7f - nvol) | (tmp & 0x80); |
188 | /*printk("DAC Volume: reg 0x%02x: 0x%02x\n", idx, ovol);*/ | 190 | /* |
191 | printk(KERN_DEBUG "DAC Volume: reg 0x%02x: 0x%02x\n", | ||
192 | idx, ovol); | ||
193 | */ | ||
189 | stac9460_put(ice, idx, (0x7f - nvol) | (tmp & 0x80)); | 194 | stac9460_put(ice, idx, (0x7f - nvol) | (tmp & 0x80)); |
190 | } | 195 | } |
191 | return change; | 196 | return change; |
@@ -344,7 +349,7 @@ static void stac9460_set_rate_val(struct snd_ice1712 *ice, unsigned int rate) | |||
344 | for (idx = 0; idx < 7 ; ++idx) | 349 | for (idx = 0; idx < 7 ; ++idx) |
345 | changed[idx] = stac9460_dac_mute(ice, | 350 | changed[idx] = stac9460_dac_mute(ice, |
346 | STAC946X_MASTER_VOLUME + idx, 0); | 351 | STAC946X_MASTER_VOLUME + idx, 0); |
347 | /*printk("Rate change: %d, new MC: 0x%02x\n", rate, new);*/ | 352 | /*printk(KERN_DEBUG "Rate change: %d, new MC: 0x%02x\n", rate, new);*/ |
348 | stac9460_put(ice, STAC946X_MASTER_CLOCKING, new); | 353 | stac9460_put(ice, STAC946X_MASTER_CLOCKING, new); |
349 | udelay(10); | 354 | udelay(10); |
350 | /* unmuting - only originally unmuted dacs - | 355 | /* unmuting - only originally unmuted dacs - |