tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ALSA: trident: Use standard printk helpers

Convert with dev_err() and co from snd_printk(), etc.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

Takashi Iwai 80c19b75 09ae539e

+48 -41
+48 -41
sound/pci/trident/trident_main.c
··· 69 69 { 70 70 unsigned int val, tmp; 71 71 72 - printk(KERN_DEBUG "Trident voice %i:\n", voice); 72 + dev_dbg(trident->card->dev, "Trident voice %i:\n", voice); 73 73 outb(voice, TRID_REG(trident, T4D_LFO_GC_CIR)); 74 74 val = inl(TRID_REG(trident, CH_LBA)); 75 - printk(KERN_DEBUG "LBA: 0x%x\n", val); 75 + dev_dbg(trident->card->dev, "LBA: 0x%x\n", val); 76 76 val = inl(TRID_REG(trident, CH_GVSEL_PAN_VOL_CTRL_EC)); 77 - printk(KERN_DEBUG "GVSel: %i\n", val >> 31); 78 - printk(KERN_DEBUG "Pan: 0x%x\n", (val >> 24) & 0x7f); 79 - printk(KERN_DEBUG "Vol: 0x%x\n", (val >> 16) & 0xff); 80 - printk(KERN_DEBUG "CTRL: 0x%x\n", (val >> 12) & 0x0f); 81 - printk(KERN_DEBUG "EC: 0x%x\n", val & 0x0fff); 77 + dev_dbg(trident->card->dev, "GVSel: %i\n", val >> 31); 78 + dev_dbg(trident->card->dev, "Pan: 0x%x\n", (val >> 24) & 0x7f); 79 + dev_dbg(trident->card->dev, "Vol: 0x%x\n", (val >> 16) & 0xff); 80 + dev_dbg(trident->card->dev, "CTRL: 0x%x\n", (val >> 12) & 0x0f); 81 + dev_dbg(trident->card->dev, "EC: 0x%x\n", val & 0x0fff); 82 82 if (trident->device != TRIDENT_DEVICE_ID_NX) { 83 83 val = inl(TRID_REG(trident, CH_DX_CSO_ALPHA_FMS)); 84 - printk(KERN_DEBUG "CSO: 0x%x\n", val >> 16); 85 - printk("Alpha: 0x%x\n", (val >> 4) & 0x0fff); 86 - printk(KERN_DEBUG "FMS: 0x%x\n", val & 0x0f); 84 + dev_dbg(trident->card->dev, "CSO: 0x%x\n", val >> 16); 85 + dev_dbg(trident->card->dev, "Alpha: 0x%x\n", (val >> 4) & 0x0fff); 86 + dev_dbg(trident->card->dev, "FMS: 0x%x\n", val & 0x0f); 87 87 val = inl(TRID_REG(trident, CH_DX_ESO_DELTA)); 88 - printk(KERN_DEBUG "ESO: 0x%x\n", val >> 16); 89 - printk(KERN_DEBUG "Delta: 0x%x\n", val & 0xffff); 88 + dev_dbg(trident->card->dev, "ESO: 0x%x\n", val >> 16); 89 + dev_dbg(trident->card->dev, "Delta: 0x%x\n", val & 0xffff); 90 90 val = inl(TRID_REG(trident, CH_DX_FMC_RVOL_CVOL)); 91 91 } else { // TRIDENT_DEVICE_ID_NX 92 92 val = inl(TRID_REG(trident, CH_NX_DELTA_CSO)); 93 93 tmp = (val >> 24) & 0xff; 94 - printk(KERN_DEBUG "CSO: 0x%x\n", val & 0x00ffffff); 94 + dev_dbg(trident->card->dev, "CSO: 0x%x\n", val & 0x00ffffff); 95 95 val = inl(TRID_REG(trident, CH_NX_DELTA_ESO)); 96 96 tmp |= (val >> 16) & 0xff00; 97 - printk(KERN_DEBUG "Delta: 0x%x\n", tmp); 98 - printk(KERN_DEBUG "ESO: 0x%x\n", val & 0x00ffffff); 97 + dev_dbg(trident->card->dev, "Delta: 0x%x\n", tmp); 98 + dev_dbg(trident->card->dev, "ESO: 0x%x\n", val & 0x00ffffff); 99 99 val = inl(TRID_REG(trident, CH_NX_ALPHA_FMS_FMC_RVOL_CVOL)); 100 - printk(KERN_DEBUG "Alpha: 0x%x\n", val >> 20); 101 - printk(KERN_DEBUG "FMS: 0x%x\n", (val >> 16) & 0x0f); 100 + dev_dbg(trident->card->dev, "Alpha: 0x%x\n", val >> 20); 101 + dev_dbg(trident->card->dev, "FMS: 0x%x\n", (val >> 16) & 0x0f); 102 102 } 103 - printk(KERN_DEBUG "FMC: 0x%x\n", (val >> 14) & 3); 104 - printk(KERN_DEBUG "RVol: 0x%x\n", (val >> 7) & 0x7f); 105 - printk(KERN_DEBUG "CVol: 0x%x\n", val & 0x7f); 103 + dev_dbg(trident->card->dev, "FMC: 0x%x\n", (val >> 14) & 3); 104 + dev_dbg(trident->card->dev, "RVol: 0x%x\n", (val >> 7) & 0x7f); 105 + dev_dbg(trident->card->dev, "CVol: 0x%x\n", val & 0x7f); 106 106 } 107 107 #endif 108 108 ··· 156 156 } 157 157 158 158 if (count == 0 && !trident->ac97_detect) { 159 - snd_printk(KERN_ERR "ac97 codec read TIMEOUT [0x%x/0x%x]!!!\n", 159 + dev_err(trident->card->dev, 160 + "ac97 codec read TIMEOUT [0x%x/0x%x]!!!\n", 160 161 reg, data); 161 162 data = 0; 162 163 } ··· 498 497 outl(regs[4], TRID_REG(trident, CH_START + 16)); 499 498 500 499 #if 0 501 - printk(KERN_DEBUG "written %i channel:\n", voice->number); 502 - printk(KERN_DEBUG " regs[0] = 0x%x/0x%x\n", 500 + dev_dbg(trident->card->dev, "written %i channel:\n", voice->number); 501 + dev_dbg(trident->card->dev, " regs[0] = 0x%x/0x%x\n", 503 502 regs[0], inl(TRID_REG(trident, CH_START + 0))); 504 - printk(KERN_DEBUG " regs[1] = 0x%x/0x%x\n", 503 + dev_dbg(trident->card->dev, " regs[1] = 0x%x/0x%x\n", 505 504 regs[1], inl(TRID_REG(trident, CH_START + 4))); 506 - printk(KERN_DEBUG " regs[2] = 0x%x/0x%x\n", 505 + dev_dbg(trident->card->dev, " regs[2] = 0x%x/0x%x\n", 507 506 regs[2], inl(TRID_REG(trident, CH_START + 8))); 508 - printk(KERN_DEBUG " regs[3] = 0x%x/0x%x\n", 507 + dev_dbg(trident->card->dev, " regs[3] = 0x%x/0x%x\n", 509 508 regs[3], inl(TRID_REG(trident, CH_START + 12))); 510 - printk(KERN_DEBUG " regs[4] = 0x%x/0x%x\n", 509 + dev_dbg(trident->card->dev, " regs[4] = 0x%x/0x%x\n", 511 510 regs[4], inl(TRID_REG(trident, CH_START + 16))); 512 511 #endif 513 512 } ··· 590 589 outb(voice->Vol >> 2, TRID_REG(trident, CH_GVSEL_PAN_VOL_CTRL_EC + 2)); 591 590 break; 592 591 case TRIDENT_DEVICE_ID_SI7018: 593 - /* printk(KERN_DEBUG "voice->Vol = 0x%x\n", voice->Vol); */ 592 + /* dev_dbg(trident->card->dev, "voice->Vol = 0x%x\n", voice->Vol); */ 594 593 outw((voice->CTRL << 12) | voice->Vol, 595 594 TRID_REG(trident, CH_GVSEL_PAN_VOL_CTRL_EC)); 596 595 break; ··· 3014 3013 _ac97.num = 1; 3015 3014 err = snd_ac97_mixer(trident->ac97_bus, &_ac97, &trident->ac97_sec); 3016 3015 if (err < 0) 3017 - snd_printk(KERN_ERR "SI7018: the secondary codec - invalid access\n"); 3016 + dev_err(trident->card->dev, 3017 + "SI7018: the secondary codec - invalid access\n"); 3018 3018 #if 0 // only for my testing purpose --jk 3019 3019 { 3020 3020 struct snd_ac97 *mc97; 3021 3021 err = snd_ac97_modem(trident->card, &_ac97, &mc97); 3022 3022 if (err < 0) 3023 - snd_printk(KERN_ERR "snd_ac97_modem returned error %i\n", err); 3023 + dev_err(trident->card->dev, 3024 + "snd_ac97_modem returned error %i\n", err); 3024 3025 } 3025 3026 #endif 3026 3027 } ··· 3200 3197 3201 3198 chip->gameport = gp = gameport_allocate_port(); 3202 3199 if (!gp) { 3203 - printk(KERN_ERR "trident: cannot allocate memory for gameport\n"); 3200 + dev_err(chip->card->dev, 3201 + "cannot allocate memory for gameport\n"); 3204 3202 return -ENOMEM; 3205 3203 } 3206 3204 ··· 3274 3270 goto __si7018_ok; 3275 3271 do_delay(trident); 3276 3272 } while (time_after_eq(end_time, jiffies)); 3277 - snd_printk(KERN_ERR "AC'97 codec ready error [0x%x]\n", inl(TRID_REG(trident, SI_SERIAL_INTF_CTRL))); 3273 + dev_err(trident->card->dev, "AC'97 codec ready error [0x%x]\n", 3274 + inl(TRID_REG(trident, SI_SERIAL_INTF_CTRL))); 3278 3275 if (r-- > 0) { 3279 3276 end_time = jiffies + HZ; 3280 3277 do { ··· 3372 3367 3373 3368 if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(trident->pci), 3374 3369 2 * SNDRV_TRIDENT_MAX_PAGES * 4, &trident->tlb.buffer) < 0) { 3375 - snd_printk(KERN_ERR "trident: unable to allocate TLB buffer\n"); 3370 + dev_err(trident->card->dev, "unable to allocate TLB buffer\n"); 3376 3371 return -ENOMEM; 3377 3372 } 3378 3373 trident->tlb.entries = (unsigned int*)ALIGN((unsigned long)trident->tlb.buffer.area, SNDRV_TRIDENT_MAX_PAGES * 4); ··· 3380 3375 /* allocate shadow TLB page table (virtual addresses) */ 3381 3376 trident->tlb.shadow_entries = vmalloc(SNDRV_TRIDENT_MAX_PAGES*sizeof(unsigned long)); 3382 3377 if (trident->tlb.shadow_entries == NULL) { 3383 - snd_printk(KERN_ERR "trident: unable to allocate shadow TLB entries\n"); 3378 + dev_err(trident->card->dev, 3379 + "unable to allocate shadow TLB entries\n"); 3384 3380 return -ENOMEM; 3385 3381 } 3386 3382 /* allocate and setup silent page and initialise TLB entries */ 3387 3383 if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(trident->pci), 3388 3384 SNDRV_TRIDENT_PAGE_SIZE, &trident->tlb.silent_page) < 0) { 3389 - snd_printk(KERN_ERR "trident: unable to allocate silent page\n"); 3385 + dev_err(trident->card->dev, "unable to allocate silent page\n"); 3390 3386 return -ENOMEM; 3391 3387 } 3392 3388 memset(trident->tlb.silent_page.area, 0, SNDRV_TRIDENT_PAGE_SIZE); ··· 3445 3439 goto __dx_ok; 3446 3440 do_delay(trident); 3447 3441 } while (time_after_eq(end_time, jiffies)); 3448 - snd_printk(KERN_ERR "AC'97 codec ready error\n"); 3442 + dev_err(trident->card->dev, "AC'97 codec ready error\n"); 3449 3443 return -EIO; 3450 3444 3451 3445 __dx_ok: ··· 3483 3477 goto __nx_ok; 3484 3478 do_delay(trident); 3485 3479 } while (time_after_eq(end_time, jiffies)); 3486 - snd_printk(KERN_ERR "AC'97 codec ready error [0x%x]\n", inl(TRID_REG(trident, NX_ACR0_AC97_COM_STAT))); 3480 + dev_err(trident->card->dev, "AC'97 codec ready error [0x%x]\n", 3481 + inl(TRID_REG(trident, NX_ACR0_AC97_COM_STAT))); 3487 3482 return -EIO; 3488 3483 3489 3484 __nx_ok: ··· 3569 3562 /* check, if we can restrict PCI DMA transfers to 30 bits */ 3570 3563 if (pci_set_dma_mask(pci, DMA_BIT_MASK(30)) < 0 || 3571 3564 pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(30)) < 0) { 3572 - snd_printk(KERN_ERR "architecture does not support 30bit PCI busmaster DMA\n"); 3565 + dev_err(card->dev, 3566 + "architecture does not support 30bit PCI busmaster DMA\n"); 3573 3567 pci_disable_device(pci); 3574 3568 return -ENXIO; 3575 3569 } ··· 3608 3600 3609 3601 if (request_irq(pci->irq, snd_trident_interrupt, IRQF_SHARED, 3610 3602 KBUILD_MODNAME, trident)) { 3611 - snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); 3603 + dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq); 3612 3604 snd_trident_free(trident); 3613 3605 return -EBUSY; 3614 3606 } ··· 3957 3949 pci_set_power_state(pci, PCI_D0); 3958 3950 pci_restore_state(pci); 3959 3951 if (pci_enable_device(pci) < 0) { 3960 - printk(KERN_ERR "trident: pci_enable_device failed, " 3961 - "disabling device\n"); 3952 + dev_err(dev, "pci_enable_device failed, disabling device\n"); 3962 3953 snd_card_disconnect(card); 3963 3954 return -EIO; 3964 3955 }