diff options
Diffstat (limited to 'sound/isa/cs423x/cs4236_lib.c')
-rw-r--r-- | sound/isa/cs423x/cs4236_lib.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/sound/isa/cs423x/cs4236_lib.c b/sound/isa/cs423x/cs4236_lib.c index 6a85fdc53b60..2406efdfd8dd 100644 --- a/sound/isa/cs423x/cs4236_lib.c +++ b/sound/isa/cs423x/cs4236_lib.c | |||
@@ -286,7 +286,8 @@ int snd_cs4236_create(struct snd_card *card, | |||
286 | if (hardware == WSS_HW_DETECT) | 286 | if (hardware == WSS_HW_DETECT) |
287 | hardware = WSS_HW_DETECT3; | 287 | hardware = WSS_HW_DETECT3; |
288 | if (cport < 0x100) { | 288 | if (cport < 0x100) { |
289 | snd_printk("please, specify control port for CS4236+ chips\n"); | 289 | snd_printk(KERN_ERR "please, specify control port " |
290 | "for CS4236+ chips\n"); | ||
290 | return -ENODEV; | 291 | return -ENODEV; |
291 | } | 292 | } |
292 | err = snd_wss_create(card, port, cport, | 293 | err = snd_wss_create(card, port, cport, |
@@ -295,7 +296,8 @@ int snd_cs4236_create(struct snd_card *card, | |||
295 | return err; | 296 | return err; |
296 | 297 | ||
297 | if (!(chip->hardware & WSS_HW_CS4236B_MASK)) { | 298 | if (!(chip->hardware & WSS_HW_CS4236B_MASK)) { |
298 | snd_printk("CS4236+: MODE3 and extended registers not available, hardware=0x%x\n",chip->hardware); | 299 | snd_printk(KERN_ERR "CS4236+: MODE3 and extended registers " |
300 | "not available, hardware=0x%x\n", chip->hardware); | ||
299 | snd_device_free(card, chip); | 301 | snd_device_free(card, chip); |
300 | return -ENODEV; | 302 | return -ENODEV; |
301 | } | 303 | } |
@@ -303,16 +305,19 @@ int snd_cs4236_create(struct snd_card *card, | |||
303 | { | 305 | { |
304 | int idx; | 306 | int idx; |
305 | for (idx = 0; idx < 8; idx++) | 307 | for (idx = 0; idx < 8; idx++) |
306 | snd_printk("CD%i = 0x%x\n", idx, inb(chip->cport + idx)); | 308 | snd_printk(KERN_DEBUG "CD%i = 0x%x\n", |
309 | idx, inb(chip->cport + idx)); | ||
307 | for (idx = 0; idx < 9; idx++) | 310 | for (idx = 0; idx < 9; idx++) |
308 | snd_printk("C%i = 0x%x\n", idx, snd_cs4236_ctrl_in(chip, idx)); | 311 | snd_printk(KERN_DEBUG "C%i = 0x%x\n", |
312 | idx, snd_cs4236_ctrl_in(chip, idx)); | ||
309 | } | 313 | } |
310 | #endif | 314 | #endif |
311 | ver1 = snd_cs4236_ctrl_in(chip, 1); | 315 | ver1 = snd_cs4236_ctrl_in(chip, 1); |
312 | ver2 = snd_cs4236_ext_in(chip, CS4236_VERSION); | 316 | ver2 = snd_cs4236_ext_in(chip, CS4236_VERSION); |
313 | snd_printdd("CS4236: [0x%lx] C1 (version) = 0x%x, ext = 0x%x\n", cport, ver1, ver2); | 317 | snd_printdd("CS4236: [0x%lx] C1 (version) = 0x%x, ext = 0x%x\n", cport, ver1, ver2); |
314 | if (ver1 != ver2) { | 318 | if (ver1 != ver2) { |
315 | snd_printk("CS4236+ chip detected, but control port 0x%lx is not valid\n", cport); | 319 | snd_printk(KERN_ERR "CS4236+ chip detected, but " |
320 | "control port 0x%lx is not valid\n", cport); | ||
316 | snd_device_free(card, chip); | 321 | snd_device_free(card, chip); |
317 | return -ENODEV; | 322 | return -ENODEV; |
318 | } | 323 | } |
@@ -883,7 +888,8 @@ static int snd_cs4236_get_iec958_switch(struct snd_kcontrol *kcontrol, struct sn | |||
883 | spin_lock_irqsave(&chip->reg_lock, flags); | 888 | spin_lock_irqsave(&chip->reg_lock, flags); |
884 | ucontrol->value.integer.value[0] = chip->image[CS4231_ALT_FEATURE_1] & 0x02 ? 1 : 0; | 889 | ucontrol->value.integer.value[0] = chip->image[CS4231_ALT_FEATURE_1] & 0x02 ? 1 : 0; |
885 | #if 0 | 890 | #if 0 |
886 | printk("get valid: ALT = 0x%x, C3 = 0x%x, C4 = 0x%x, C5 = 0x%x, C6 = 0x%x, C8 = 0x%x\n", | 891 | printk(KERN_DEBUG "get valid: ALT = 0x%x, C3 = 0x%x, C4 = 0x%x, " |
892 | "C5 = 0x%x, C6 = 0x%x, C8 = 0x%x\n", | ||
887 | snd_wss_in(chip, CS4231_ALT_FEATURE_1), | 893 | snd_wss_in(chip, CS4231_ALT_FEATURE_1), |
888 | snd_cs4236_ctrl_in(chip, 3), | 894 | snd_cs4236_ctrl_in(chip, 3), |
889 | snd_cs4236_ctrl_in(chip, 4), | 895 | snd_cs4236_ctrl_in(chip, 4), |
@@ -920,7 +926,8 @@ static int snd_cs4236_put_iec958_switch(struct snd_kcontrol *kcontrol, struct sn | |||
920 | mutex_unlock(&chip->mce_mutex); | 926 | mutex_unlock(&chip->mce_mutex); |
921 | 927 | ||
922 | #if 0 | 928 | #if 0 |
923 | printk("set valid: ALT = 0x%x, C3 = 0x%x, C4 = 0x%x, C5 = 0x%x, C6 = 0x%x, C8 = 0x%x\n", | 929 | printk(KERN_DEBUG "set valid: ALT = 0x%x, C3 = 0x%x, C4 = 0x%x, " |
930 | "C5 = 0x%x, C6 = 0x%x, C8 = 0x%x\n", | ||
924 | snd_wss_in(chip, CS4231_ALT_FEATURE_1), | 931 | snd_wss_in(chip, CS4231_ALT_FEATURE_1), |
925 | snd_cs4236_ctrl_in(chip, 3), | 932 | snd_cs4236_ctrl_in(chip, 3), |
926 | snd_cs4236_ctrl_in(chip, 4), | 933 | snd_cs4236_ctrl_in(chip, 4), |