5 files changed, 22 insertions, 14 deletions

diff --git a/sound/arm/sa11xx-uda1341.c b/sound/arm/sa11xx-uda1341.c
index 1dcd51d81d10..ed481a866a3e 100644
--- a/sound/arm/sa11xx-uda1341.c
+++ b/sound/arm/sa11xx-uda1341.c
@@ -914,7 +914,7 @@ static int __devinit sa11xx_uda1341_probe(struct platform_device *devptr)
         snd_card_set_dev(card, &devptr->dev);
 
         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);
                 return 0;
         }
diff --git a/sound/mips/au1x00.c b/sound/mips/au1x00.c
index 1881cec11e78..7c1afc96ab87 100644
--- a/sound/mips/au1x00.c
+++ b/sound/mips/au1x00.c
@@ -678,7 +678,7 @@ au1000_init(void)
                 return err;
         }
 
-        printk( KERN_INFO "ALSA AC97: Driver Initialized\n" );
+        printk(KERN_INFO "ALSA AC97: Driver Initialized\n");
         au1000_card = card;
         return 0;
 }
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf_core.c b/sound/pcmcia/pdaudiocf/pdaudiocf_core.c
index dfa40b0ed86d..5d2afa0b0ce4 100644
--- a/sound/pcmcia/pdaudiocf/pdaudiocf_core.c
+++ b/sound/pcmcia/pdaudiocf/pdaudiocf_core.c
@@ -82,14 +82,21 @@ static void pdacf_ak4117_write(void *private_data, unsigned char reg, unsigned c
 #if 0
 void pdacf_dump(struct snd_pdacf *chip)
 {
-        printk("PDAUDIOCF DUMP (0x%lx):\n", chip->port);
-        printk("WPD         : 0x%x\n", inw(chip->port + PDAUDIOCF_REG_WDP));
-        printk("RDP         : 0x%x\n", inw(chip->port + PDAUDIOCF_REG_RDP));
-        printk("TCR         : 0x%x\n", inw(chip->port + PDAUDIOCF_REG_TCR));
-        printk("SCR         : 0x%x\n", inw(chip->port + PDAUDIOCF_REG_SCR));
-        printk("ISR         : 0x%x\n", inw(chip->port + PDAUDIOCF_REG_ISR));
-        printk("IER         : 0x%x\n", inw(chip->port + PDAUDIOCF_REG_IER));
-        printk("AK_IFR      : 0x%x\n", inw(chip->port + PDAUDIOCF_REG_AK_IFR));
+        printk(KERN_DEBUG "PDAUDIOCF DUMP (0x%lx):\n", chip->port);
+        printk(KERN_DEBUG "WPD         : 0x%x\n",
+               inw(chip->port + PDAUDIOCF_REG_WDP));
+        printk(KERN_DEBUG "RDP         : 0x%x\n",
+               inw(chip->port + PDAUDIOCF_REG_RDP));
+        printk(KERN_DEBUG "TCR         : 0x%x\n",
+               inw(chip->port + PDAUDIOCF_REG_TCR));
+        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
 
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf_irq.c b/sound/pcmcia/pdaudiocf/pdaudiocf_irq.c
index ea903c8e90dd..dcd32201bc8c 100644
--- a/sound/pcmcia/pdaudiocf/pdaudiocf_irq.c
+++ b/sound/pcmcia/pdaudiocf/pdaudiocf_irq.c
@@ -269,7 +269,7 @@ void pdacf_tasklet(unsigned long private_data)
 
         rdp = inw(chip->port + PDAUDIOCF_REG_RDP);
         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;
         if (size < 0)
                 size += 0x10000;
@@ -321,5 +321,5 @@ void pdacf_tasklet(unsigned long private_data)
                 spin_lock(&chip->reg_lock);
         }
         spin_unlock(&chip->reg_lock);
-        // printk("TASKLET: end\n");
+        /* printk(KERN_DEBUG "TASKLET: end\n"); */
 }
diff --git a/sound/sparc/amd7930.c b/sound/sparc/amd7930.c
index f87933e48812..7cbc725934e5 100644
--- a/sound/sparc/amd7930.c
+++ b/sound/sparc/amd7930.c
@@ -954,7 +954,8 @@ static int __devinit snd_amd7930_create(struct snd_card *card,
         amd->regs = of_ioremap(&op->resource[0], 0,
                                resource_size(&op->resource[0]), "amd7930");
         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;
         }
 
@@ -962,7 +963,7 @@ static int __devinit snd_amd7930_create(struct snd_card *card,
 
         if (request_irq(irq, snd_amd7930_interrupt,
                         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);
                 snd_amd7930_free(amd);
                 return -EBUSY;