Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 2ebfb8eeb8f244f9d25937d31a947895cf819e26

Authored by Takashi Iwai
1 parent ee419653a3
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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

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

Showing 5 changed files with 22 additions and 14 deletions Side-by-side Diff

sound/arm/sa11xx-uda1341.c
Diff comments   View file @ 2ebfb8e
... ... @@ -914,7 +914,7 @@
914 914 snd_card_set_dev(card, &devptr->dev);
915 915  
916 916 if ((err = snd_card_register(card)) == 0) {
917   - printk( KERN_INFO "iPAQ audio support initialized\n" );
  917 + printk(KERN_INFO "iPAQ audio support initialized\n");
918 918 platform_set_drvdata(devptr, card);
919 919 return 0;
920 920 }
... ... @@ -678,7 +678,7 @@
678 678 return err;
679 679 }
680 680  
681   - printk( KERN_INFO "ALSA AC97: Driver Initialized\n" );
  681 + printk(KERN_INFO "ALSA AC97: Driver Initialized\n");
682 682 au1000_card = card;
683 683 return 0;
684 684 }
sound/pcmcia/pdaudiocf/pdaudiocf_core.c
Diff comments   View file @ 2ebfb8e
... ... @@ -82,14 +82,21 @@
82 82 #if 0
83 83 void pdacf_dump(struct snd_pdacf *chip)
84 84 {
85   - printk("PDAUDIOCF DUMP (0x%lx):\n", chip->port);
86   - printk("WPD : 0x%x\n", inw(chip->port + PDAUDIOCF_REG_WDP));
87   - printk("RDP : 0x%x\n", inw(chip->port + PDAUDIOCF_REG_RDP));
88   - printk("TCR : 0x%x\n", inw(chip->port + PDAUDIOCF_REG_TCR));
89   - printk("SCR : 0x%x\n", inw(chip->port + PDAUDIOCF_REG_SCR));
90   - printk("ISR : 0x%x\n", inw(chip->port + PDAUDIOCF_REG_ISR));
91   - printk("IER : 0x%x\n", inw(chip->port + PDAUDIOCF_REG_IER));
92   - printk("AK_IFR : 0x%x\n", inw(chip->port + PDAUDIOCF_REG_AK_IFR));
  85 + printk(KERN_DEBUG "PDAUDIOCF DUMP (0x%lx):\n", chip->port);
  86 + printk(KERN_DEBUG "WPD : 0x%x\n",
  87 + inw(chip->port + PDAUDIOCF_REG_WDP));
  88 + printk(KERN_DEBUG "RDP : 0x%x\n",
  89 + inw(chip->port + PDAUDIOCF_REG_RDP));
  90 + printk(KERN_DEBUG "TCR : 0x%x\n",
  91 + inw(chip->port + PDAUDIOCF_REG_TCR));
  92 + printk(KERN_DEBUG "SCR : 0x%x\n",
  93 + inw(chip->port + PDAUDIOCF_REG_SCR));
  94 + printk(KERN_DEBUG "ISR : 0x%x\n",
  95 + inw(chip->port + PDAUDIOCF_REG_ISR));
  96 + printk(KERN_DEBUG "IER : 0x%x\n",
  97 + inw(chip->port + PDAUDIOCF_REG_IER));
  98 + printk(KERN_DEBUG "AK_IFR : 0x%x\n",
  99 + inw(chip->port + PDAUDIOCF_REG_AK_IFR));
93 100 }
94 101 #endif
95 102  
sound/pcmcia/pdaudiocf/pdaudiocf_irq.c
Diff comments   View file @ 2ebfb8e
... ... @@ -269,7 +269,7 @@
269 269  
270 270 rdp = inw(chip->port + PDAUDIOCF_REG_RDP);
271 271 wdp = inw(chip->port + PDAUDIOCF_REG_WDP);
272   - // printk("TASKLET: rdp = %x, wdp = %x\n", rdp, wdp);
  272 + /* printk(KERN_DEBUG "TASKLET: rdp = %x, wdp = %x\n", rdp, wdp); */
273 273 size = wdp - rdp;
274 274 if (size < 0)
275 275 size += 0x10000;
... ... @@ -321,6 +321,6 @@
321 321 spin_lock(&chip->reg_lock);
322 322 }
323 323 spin_unlock(&chip->reg_lock);
324   - // printk("TASKLET: end\n");
  324 + /* printk(KERN_DEBUG "TASKLET: end\n"); */
325 325 }
sound/sparc/amd7930.c
Diff comments   View file @ 2ebfb8e
... ... @@ -954,7 +954,8 @@
954 954 amd->regs = of_ioremap(&op->resource[0], 0,
955 955 resource_size(&op->resource[0]), "amd7930");
956 956 if (!amd->regs) {
957   - snd_printk("amd7930-%d: Unable to map chip registers.\n", dev);
  957 + snd_printk(KERN_ERR
  958 + "amd7930-%d: Unable to map chip registers.\n", dev);
958 959 return -EIO;
959 960 }
960 961  
... ... @@ -962,7 +963,7 @@
962 963  
963 964 if (request_irq(irq, snd_amd7930_interrupt,
964 965 IRQF_DISABLED | IRQF_SHARED, "amd7930", amd)) {
965   - snd_printk("amd7930-%d: Unable to grab IRQ %d\n",
  966 + snd_printk(KERN_ERR "amd7930-%d: Unable to grab IRQ %d\n",
966 967 dev, irq);
967 968 snd_amd7930_free(amd);
968 969 return -EBUSY;