aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/intel8x0.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/intel8x0.c')
-rw-r--r--sound/pci/intel8x0.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index 68d0ed033d3a..d71f5d1e7169 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -538,7 +538,7 @@ static int snd_intel8x0_codec_semaphore(intel8x0_t *chip, unsigned int codec)
538 /* access to some forbidden (non existant) ac97 registers will not 538 /* access to some forbidden (non existant) ac97 registers will not
539 * reset the semaphore. So even if you don't get the semaphore, still 539 * reset the semaphore. So even if you don't get the semaphore, still
540 * continue the access. We don't need the semaphore anyway. */ 540 * continue the access. We don't need the semaphore anyway. */
541 snd_printk("codec_semaphore: semaphore is not ready [0x%x][0x%x]\n", 541 snd_printk(KERN_ERR "codec_semaphore: semaphore is not ready [0x%x][0x%x]\n",
542 igetbyte(chip, ICHREG(ACC_SEMA)), igetdword(chip, ICHREG(GLOB_STA))); 542 igetbyte(chip, ICHREG(ACC_SEMA)), igetdword(chip, ICHREG(GLOB_STA)));
543 iagetword(chip, 0); /* clear semaphore flag */ 543 iagetword(chip, 0); /* clear semaphore flag */
544 /* I don't care about the semaphore */ 544 /* I don't care about the semaphore */
@@ -553,7 +553,7 @@ static void snd_intel8x0_codec_write(ac97_t *ac97,
553 553
554 if (snd_intel8x0_codec_semaphore(chip, ac97->num) < 0) { 554 if (snd_intel8x0_codec_semaphore(chip, ac97->num) < 0) {
555 if (! chip->in_ac97_init) 555 if (! chip->in_ac97_init)
556 snd_printk("codec_write %d: semaphore is not ready for register 0x%x\n", ac97->num, reg); 556 snd_printk(KERN_ERR "codec_write %d: semaphore is not ready for register 0x%x\n", ac97->num, reg);
557 } 557 }
558 iaputword(chip, reg + ac97->num * 0x80, val); 558 iaputword(chip, reg + ac97->num * 0x80, val);
559} 559}
@@ -567,7 +567,7 @@ static unsigned short snd_intel8x0_codec_read(ac97_t *ac97,
567 567
568 if (snd_intel8x0_codec_semaphore(chip, ac97->num) < 0) { 568 if (snd_intel8x0_codec_semaphore(chip, ac97->num) < 0) {
569 if (! chip->in_ac97_init) 569 if (! chip->in_ac97_init)
570 snd_printk("codec_read %d: semaphore is not ready for register 0x%x\n", ac97->num, reg); 570 snd_printk(KERN_ERR "codec_read %d: semaphore is not ready for register 0x%x\n", ac97->num, reg);
571 res = 0xffff; 571 res = 0xffff;
572 } else { 572 } else {
573 res = iagetword(chip, reg + ac97->num * 0x80); 573 res = iagetword(chip, reg + ac97->num * 0x80);
@@ -575,7 +575,7 @@ static unsigned short snd_intel8x0_codec_read(ac97_t *ac97,
575 /* reset RCS and preserve other R/WC bits */ 575 /* reset RCS and preserve other R/WC bits */
576 iputdword(chip, ICHREG(GLOB_STA), tmp & ~(ICH_SRI|ICH_PRI|ICH_TRI|ICH_GSCI)); 576 iputdword(chip, ICHREG(GLOB_STA), tmp & ~(ICH_SRI|ICH_PRI|ICH_TRI|ICH_GSCI));
577 if (! chip->in_ac97_init) 577 if (! chip->in_ac97_init)
578 snd_printk("codec_read %d: read timeout for register 0x%x\n", ac97->num, reg); 578 snd_printk(KERN_ERR "codec_read %d: read timeout for register 0x%x\n", ac97->num, reg);
579 res = 0xffff; 579 res = 0xffff;
580 } 580 }
581 } 581 }
@@ -2173,7 +2173,7 @@ static int snd_intel8x0_ich_chip_init(intel8x0_t *chip, int probing)
2173 goto __ok; 2173 goto __ok;
2174 do_delay(chip); 2174 do_delay(chip);
2175 } while (time_after_eq(end_time, jiffies)); 2175 } while (time_after_eq(end_time, jiffies));
2176 snd_printk("AC'97 warm reset still in progress? [0x%x]\n", igetdword(chip, ICHREG(GLOB_CNT))); 2176 snd_printk(KERN_ERR "AC'97 warm reset still in progress? [0x%x]\n", igetdword(chip, ICHREG(GLOB_CNT)));
2177 return -EIO; 2177 return -EIO;
2178 2178
2179 __ok: 2179 __ok:
@@ -2448,7 +2448,7 @@ static void __devinit intel8x0_measure_ac97_clock(intel8x0_t *chip)
2448 2448
2449 subs = chip->pcm[0]->streams[0].substream; 2449 subs = chip->pcm[0]->streams[0].substream;
2450 if (! subs || subs->dma_buffer.bytes < INTEL8X0_TESTBUF_SIZE) { 2450 if (! subs || subs->dma_buffer.bytes < INTEL8X0_TESTBUF_SIZE) {
2451 snd_printk("no playback buffer allocated - aborting measure ac97 clock\n"); 2451 snd_printk(KERN_WARNING "no playback buffer allocated - aborting measure ac97 clock\n");
2452 return; 2452 return;
2453 } 2453 }
2454 ichdev = &chip->ichd[ICHD_PCMOUT]; 2454 ichdev = &chip->ichd[ICHD_PCMOUT];
@@ -2655,7 +2655,7 @@ static int __devinit snd_intel8x0_create(snd_card_t * card,
2655 chip->remap_addr = ioremap_nocache(chip->addr, 2655 chip->remap_addr = ioremap_nocache(chip->addr,
2656 pci_resource_len(pci, 2)); 2656 pci_resource_len(pci, 2));
2657 if (chip->remap_addr == NULL) { 2657 if (chip->remap_addr == NULL) {
2658 snd_printk("AC'97 space ioremap problem\n"); 2658 snd_printk(KERN_ERR "AC'97 space ioremap problem\n");
2659 snd_intel8x0_free(chip); 2659 snd_intel8x0_free(chip);
2660 return -EIO; 2660 return -EIO;
2661 } 2661 }
@@ -2668,7 +2668,7 @@ static int __devinit snd_intel8x0_create(snd_card_t * card,
2668 chip->remap_bmaddr = ioremap_nocache(chip->bmaddr, 2668 chip->remap_bmaddr = ioremap_nocache(chip->bmaddr,
2669 pci_resource_len(pci, 3)); 2669 pci_resource_len(pci, 3));
2670 if (chip->remap_bmaddr == NULL) { 2670 if (chip->remap_bmaddr == NULL) {
2671 snd_printk("Controller space ioremap problem\n"); 2671 snd_printk(KERN_ERR "Controller space ioremap problem\n");
2672 snd_intel8x0_free(chip); 2672 snd_intel8x0_free(chip);
2673 return -EIO; 2673 return -EIO;
2674 } 2674 }
@@ -2678,7 +2678,7 @@ static int __devinit snd_intel8x0_create(snd_card_t * card,
2678 2678
2679 port_inited: 2679 port_inited:
2680 if (request_irq(pci->irq, snd_intel8x0_interrupt, SA_INTERRUPT|SA_SHIRQ, card->shortname, (void *)chip)) { 2680 if (request_irq(pci->irq, snd_intel8x0_interrupt, SA_INTERRUPT|SA_SHIRQ, card->shortname, (void *)chip)) {
2681 snd_printk("unable to grab IRQ %d\n", pci->irq); 2681 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
2682 snd_intel8x0_free(chip); 2682 snd_intel8x0_free(chip);
2683 return -EBUSY; 2683 return -EBUSY;
2684 } 2684 }