diff options
Diffstat (limited to 'sound/pci/intel8x0m.c')
-rw-r--r-- | sound/pci/intel8x0m.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c index 42601f0e6a57..49a9f4d08963 100644 --- a/sound/pci/intel8x0m.c +++ b/sound/pci/intel8x0m.c | |||
@@ -363,7 +363,7 @@ static int snd_intel8x0m_codec_semaphore(intel8x0_t *chip, unsigned int codec) | |||
363 | /* access to some forbidden (non existant) ac97 registers will not | 363 | /* access to some forbidden (non existant) ac97 registers will not |
364 | * reset the semaphore. So even if you don't get the semaphore, still | 364 | * reset the semaphore. So even if you don't get the semaphore, still |
365 | * continue the access. We don't need the semaphore anyway. */ | 365 | * continue the access. We don't need the semaphore anyway. */ |
366 | snd_printk("codec_semaphore: semaphore is not ready [0x%x][0x%x]\n", | 366 | snd_printk(KERN_ERR "codec_semaphore: semaphore is not ready [0x%x][0x%x]\n", |
367 | igetbyte(chip, ICHREG(ACC_SEMA)), igetdword(chip, ICHREG(GLOB_STA))); | 367 | igetbyte(chip, ICHREG(ACC_SEMA)), igetdword(chip, ICHREG(GLOB_STA))); |
368 | iagetword(chip, 0); /* clear semaphore flag */ | 368 | iagetword(chip, 0); /* clear semaphore flag */ |
369 | /* I don't care about the semaphore */ | 369 | /* I don't care about the semaphore */ |
@@ -378,7 +378,7 @@ static void snd_intel8x0_codec_write(ac97_t *ac97, | |||
378 | 378 | ||
379 | if (snd_intel8x0m_codec_semaphore(chip, ac97->num) < 0) { | 379 | if (snd_intel8x0m_codec_semaphore(chip, ac97->num) < 0) { |
380 | if (! chip->in_ac97_init) | 380 | if (! chip->in_ac97_init) |
381 | snd_printk("codec_write %d: semaphore is not ready for register 0x%x\n", ac97->num, reg); | 381 | snd_printk(KERN_ERR "codec_write %d: semaphore is not ready for register 0x%x\n", ac97->num, reg); |
382 | } | 382 | } |
383 | iaputword(chip, reg + ac97->num * 0x80, val); | 383 | iaputword(chip, reg + ac97->num * 0x80, val); |
384 | } | 384 | } |
@@ -392,7 +392,7 @@ static unsigned short snd_intel8x0_codec_read(ac97_t *ac97, | |||
392 | 392 | ||
393 | if (snd_intel8x0m_codec_semaphore(chip, ac97->num) < 0) { | 393 | if (snd_intel8x0m_codec_semaphore(chip, ac97->num) < 0) { |
394 | if (! chip->in_ac97_init) | 394 | if (! chip->in_ac97_init) |
395 | snd_printk("codec_read %d: semaphore is not ready for register 0x%x\n", ac97->num, reg); | 395 | snd_printk(KERN_ERR "codec_read %d: semaphore is not ready for register 0x%x\n", ac97->num, reg); |
396 | res = 0xffff; | 396 | res = 0xffff; |
397 | } else { | 397 | } else { |
398 | res = iagetword(chip, reg + ac97->num * 0x80); | 398 | res = iagetword(chip, reg + ac97->num * 0x80); |
@@ -400,7 +400,7 @@ static unsigned short snd_intel8x0_codec_read(ac97_t *ac97, | |||
400 | /* reset RCS and preserve other R/WC bits */ | 400 | /* reset RCS and preserve other R/WC bits */ |
401 | iputdword(chip, ICHREG(GLOB_STA), tmp & ~(ICH_SRI|ICH_PRI|ICH_TRI|ICH_GSCI)); | 401 | iputdword(chip, ICHREG(GLOB_STA), tmp & ~(ICH_SRI|ICH_PRI|ICH_TRI|ICH_GSCI)); |
402 | if (! chip->in_ac97_init) | 402 | if (! chip->in_ac97_init) |
403 | snd_printk("codec_read %d: read timeout for register 0x%x\n", ac97->num, reg); | 403 | snd_printk(KERN_ERR "codec_read %d: read timeout for register 0x%x\n", ac97->num, reg); |
404 | res = 0xffff; | 404 | res = 0xffff; |
405 | } | 405 | } |
406 | } | 406 | } |
@@ -917,7 +917,7 @@ static int snd_intel8x0m_ich_chip_init(intel8x0_t *chip, int probing) | |||
917 | goto __ok; | 917 | goto __ok; |
918 | do_delay(chip); | 918 | do_delay(chip); |
919 | } while (time_after_eq(end_time, jiffies)); | 919 | } while (time_after_eq(end_time, jiffies)); |
920 | snd_printk("AC'97 warm reset still in progress? [0x%x]\n", igetdword(chip, ICHREG(GLOB_CNT))); | 920 | snd_printk(KERN_ERR "AC'97 warm reset still in progress? [0x%x]\n", igetdword(chip, ICHREG(GLOB_CNT))); |
921 | return -EIO; | 921 | return -EIO; |
922 | 922 | ||
923 | __ok: | 923 | __ok: |
@@ -1143,7 +1143,7 @@ static int __devinit snd_intel8x0m_create(snd_card_t * card, | |||
1143 | chip->remap_addr = ioremap_nocache(chip->addr, | 1143 | chip->remap_addr = ioremap_nocache(chip->addr, |
1144 | pci_resource_len(pci, 2)); | 1144 | pci_resource_len(pci, 2)); |
1145 | if (chip->remap_addr == NULL) { | 1145 | if (chip->remap_addr == NULL) { |
1146 | snd_printk("AC'97 space ioremap problem\n"); | 1146 | snd_printk(KERN_ERR "AC'97 space ioremap problem\n"); |
1147 | snd_intel8x0_free(chip); | 1147 | snd_intel8x0_free(chip); |
1148 | return -EIO; | 1148 | return -EIO; |
1149 | } | 1149 | } |
@@ -1156,7 +1156,7 @@ static int __devinit snd_intel8x0m_create(snd_card_t * card, | |||
1156 | chip->remap_bmaddr = ioremap_nocache(chip->bmaddr, | 1156 | chip->remap_bmaddr = ioremap_nocache(chip->bmaddr, |
1157 | pci_resource_len(pci, 3)); | 1157 | pci_resource_len(pci, 3)); |
1158 | if (chip->remap_bmaddr == NULL) { | 1158 | if (chip->remap_bmaddr == NULL) { |
1159 | snd_printk("Controller space ioremap problem\n"); | 1159 | snd_printk(KERN_ERR "Controller space ioremap problem\n"); |
1160 | snd_intel8x0_free(chip); | 1160 | snd_intel8x0_free(chip); |
1161 | return -EIO; | 1161 | return -EIO; |
1162 | } | 1162 | } |
@@ -1166,7 +1166,7 @@ static int __devinit snd_intel8x0m_create(snd_card_t * card, | |||
1166 | 1166 | ||
1167 | port_inited: | 1167 | port_inited: |
1168 | if (request_irq(pci->irq, snd_intel8x0_interrupt, SA_INTERRUPT|SA_SHIRQ, card->shortname, (void *)chip)) { | 1168 | if (request_irq(pci->irq, snd_intel8x0_interrupt, SA_INTERRUPT|SA_SHIRQ, card->shortname, (void *)chip)) { |
1169 | snd_printk("unable to grab IRQ %d\n", pci->irq); | 1169 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
1170 | snd_intel8x0_free(chip); | 1170 | snd_intel8x0_free(chip); |
1171 | return -EBUSY; | 1171 | return -EBUSY; |
1172 | } | 1172 | } |