Skip to content

L
linux
Commit 2ebfb8ee authored by Takashi Iwai's avatar Takashi Iwai
Browse files
Options

ALSA: Add missing KERN_* prefix to printk in other sound/* 

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent ee419653
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 14 deletions
sound/arm/sa11xx-uda1341.c
View file @ 2ebfb8ee
...@@ -914,7 +914,7 @@ static int __devinit sa11xx_uda1341_probe(struct platform_device *devptr) ...@@ -914,7 +914,7 @@ static int __devinit sa11xx_uda1341_probe(struct platform_device *devptr)
snd_card_set_dev(card, &devptr->dev); snd_card_set_dev(card, &devptr->dev);
if ((err = snd_card_register(card)) == 0) { if ((err = snd_card_register(card)) == 0) {
printk( KERN_INFO "iPAQ audio support initialized\n" ); printk(KERN_INFO "iPAQ audio support initialized\n");
platform_set_drvdata(devptr, card); platform_set_drvdata(devptr, card);
return 0; return 0;
} }
......
sound/mips/au1x00.c
View file @ 2ebfb8ee
...@@ -678,7 +678,7 @@ au1000_init(void) ...@@ -678,7 +678,7 @@ au1000_init(void)
return err; return err;
} }
printk( KERN_INFO "ALSA AC97: Driver Initialized\n" ); printk(KERN_INFO "ALSA AC97: Driver Initialized\n");
au1000_card = card; au1000_card = card;
return 0; return 0;
} }
......
sound/pcmcia/pdaudiocf/pdaudiocf_core.c
View file @ 2ebfb8ee
...@@ -82,14 +82,21 @@ static void pdacf_ak4117_write(void *private_data, unsigned char reg, unsigned c ...@@ -82,14 +82,21 @@ static void pdacf_ak4117_write(void *private_data, unsigned char reg, unsigned c
#if 0 #if 0
void pdacf_dump(struct snd_pdacf *chip) void pdacf_dump(struct snd_pdacf *chip)
{ {
printk("PDAUDIOCF DUMP (0x%lx):\n", chip->port); printk(KERN_DEBUG "PDAUDIOCF DUMP (0x%lx):\n", chip->port);
printk("WPD : 0x%x\n", inw(chip->port + PDAUDIOCF_REG_WDP)); printk(KERN_DEBUG "WPD : 0x%x\n",
printk("RDP : 0x%x\n", inw(chip->port + PDAUDIOCF_REG_RDP)); inw(chip->port + PDAUDIOCF_REG_WDP));
printk("TCR : 0x%x\n", inw(chip->port + PDAUDIOCF_REG_TCR)); printk(KERN_DEBUG "RDP : 0x%x\n",
printk("SCR : 0x%x\n", inw(chip->port + PDAUDIOCF_REG_SCR)); inw(chip->port + PDAUDIOCF_REG_RDP));
printk("ISR : 0x%x\n", inw(chip->port + PDAUDIOCF_REG_ISR)); printk(KERN_DEBUG "TCR : 0x%x\n",
printk("IER : 0x%x\n", inw(chip->port + PDAUDIOCF_REG_IER)); inw(chip->port + PDAUDIOCF_REG_TCR));
printk("AK_IFR : 0x%x\n", inw(chip->port + PDAUDIOCF_REG_AK_IFR)); printk(KERN_DEBUG "SCR : 0x%x\n",
inw(chip->port + PDAUDIOCF_REG_SCR));
printk(KERN_DEBUG "ISR : 0x%x\n",
inw(chip->port + PDAUDIOCF_REG_ISR));
printk(KERN_DEBUG "IER : 0x%x\n",
inw(chip->port + PDAUDIOCF_REG_IER));
printk(KERN_DEBUG "AK_IFR : 0x%x\n",
inw(chip->port + PDAUDIOCF_REG_AK_IFR));
} }
#endif #endif
......
sound/pcmcia/pdaudiocf/pdaudiocf_irq.c
View file @ 2ebfb8ee
...@@ -269,7 +269,7 @@ void pdacf_tasklet(unsigned long private_data) ...@@ -269,7 +269,7 @@ void pdacf_tasklet(unsigned long private_data)
rdp = inw(chip->port + PDAUDIOCF_REG_RDP); rdp = inw(chip->port + PDAUDIOCF_REG_RDP);
wdp = inw(chip->port + PDAUDIOCF_REG_WDP); wdp = inw(chip->port + PDAUDIOCF_REG_WDP);
// printk("TASKLET: rdp = %x, wdp = %x\n", rdp, wdp); /* printk(KERN_DEBUG "TASKLET: rdp = %x, wdp = %x\n", rdp, wdp); */
size = wdp - rdp; size = wdp - rdp;
if (size < 0) if (size < 0)
size += 0x10000; size += 0x10000;
...@@ -321,5 +321,5 @@ void pdacf_tasklet(unsigned long private_data) ...@@ -321,5 +321,5 @@ void pdacf_tasklet(unsigned long private_data)
spin_lock(&chip->reg_lock); spin_lock(&chip->reg_lock);
} }
spin_unlock(&chip->reg_lock); spin_unlock(&chip->reg_lock);
// printk("TASKLET: end\n"); /* printk(KERN_DEBUG "TASKLET: end\n"); */
} }
sound/sparc/amd7930.c
View file @ 2ebfb8ee
...@@ -954,7 +954,8 @@ static int __devinit snd_amd7930_create(struct snd_card *card, ...@@ -954,7 +954,8 @@ static int __devinit snd_amd7930_create(struct snd_card *card,
amd->regs = of_ioremap(&op->resource[0], 0, amd->regs = of_ioremap(&op->resource[0], 0,
resource_size(&op->resource[0]), "amd7930"); resource_size(&op->resource[0]), "amd7930");
if (!amd->regs) { if (!amd->regs) {
snd_printk("amd7930-%d: Unable to map chip registers.\n", dev); snd_printk(KERN_ERR
"amd7930-%d: Unable to map chip registers.\n", dev);
return -EIO; return -EIO;
} }
...@@ -962,7 +963,7 @@ static int __devinit snd_amd7930_create(struct snd_card *card, ...@@ -962,7 +963,7 @@ static int __devinit snd_amd7930_create(struct snd_card *card,
if (request_irq(irq, snd_amd7930_interrupt, if (request_irq(irq, snd_amd7930_interrupt,
IRQF_DISABLED | IRQF_SHARED, "amd7930", amd)) { IRQF_DISABLED | IRQF_SHARED, "amd7930", amd)) {
snd_printk("amd7930-%d: Unable to grab IRQ %d\n", snd_printk(KERN_ERR "amd7930-%d: Unable to grab IRQ %d\n",
dev, irq); dev, irq);
snd_amd7930_free(amd); snd_amd7930_free(amd);
return -EBUSY; return -EBUSY;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7