diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-02-05 10:11:58 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-02-05 10:11:58 -0500 |
commit | 2ebfb8eeb8f244f9d25937d31a947895cf819e26 (patch) | |
tree | 65f383cbe592aeef04f67378a357779e756f0cbf | |
parent | ee419653a38de93b75a577851d9e4003cf0bbe07 (diff) |
ALSA: Add missing KERN_* prefix to printk in other sound/*
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/arm/sa11xx-uda1341.c | 2 | ||||
-rw-r--r-- | sound/mips/au1x00.c | 2 | ||||
-rw-r--r-- | sound/pcmcia/pdaudiocf/pdaudiocf_core.c | 23 | ||||
-rw-r--r-- | sound/pcmcia/pdaudiocf/pdaudiocf_irq.c | 4 | ||||
-rw-r--r-- | sound/sparc/amd7930.c | 5 |
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) | |||
914 | snd_card_set_dev(card, &devptr->dev); | 914 | snd_card_set_dev(card, &devptr->dev); |
915 | 915 | ||
916 | if ((err = snd_card_register(card)) == 0) { | 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 | platform_set_drvdata(devptr, card); | 918 | platform_set_drvdata(devptr, card); |
919 | return 0; | 919 | return 0; |
920 | } | 920 | } |
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) | |||
678 | return err; | 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 | au1000_card = card; | 682 | au1000_card = card; |
683 | return 0; | 683 | return 0; |
684 | } | 684 | } |
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 | |||
82 | #if 0 | 82 | #if 0 |
83 | void pdacf_dump(struct snd_pdacf *chip) | 83 | void pdacf_dump(struct snd_pdacf *chip) |
84 | { | 84 | { |
85 | printk("PDAUDIOCF DUMP (0x%lx):\n", chip->port); | 85 | printk(KERN_DEBUG "PDAUDIOCF DUMP (0x%lx):\n", chip->port); |
86 | printk("WPD : 0x%x\n", inw(chip->port + PDAUDIOCF_REG_WDP)); | 86 | printk(KERN_DEBUG "WPD : 0x%x\n", |
87 | printk("RDP : 0x%x\n", inw(chip->port + PDAUDIOCF_REG_RDP)); | 87 | inw(chip->port + PDAUDIOCF_REG_WDP)); |
88 | printk("TCR : 0x%x\n", inw(chip->port + PDAUDIOCF_REG_TCR)); | 88 | printk(KERN_DEBUG "RDP : 0x%x\n", |
89 | printk("SCR : 0x%x\n", inw(chip->port + PDAUDIOCF_REG_SCR)); | 89 | inw(chip->port + PDAUDIOCF_REG_RDP)); |
90 | printk("ISR : 0x%x\n", inw(chip->port + PDAUDIOCF_REG_ISR)); | 90 | printk(KERN_DEBUG "TCR : 0x%x\n", |
91 | printk("IER : 0x%x\n", inw(chip->port + PDAUDIOCF_REG_IER)); | 91 | inw(chip->port + PDAUDIOCF_REG_TCR)); |
92 | printk("AK_IFR : 0x%x\n", inw(chip->port + PDAUDIOCF_REG_AK_IFR)); | 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 | #endif | 101 | #endif |
95 | 102 | ||
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) | |||
269 | 269 | ||
270 | rdp = inw(chip->port + PDAUDIOCF_REG_RDP); | 270 | rdp = inw(chip->port + PDAUDIOCF_REG_RDP); |
271 | wdp = inw(chip->port + PDAUDIOCF_REG_WDP); | 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 | size = wdp - rdp; | 273 | size = wdp - rdp; |
274 | if (size < 0) | 274 | if (size < 0) |
275 | size += 0x10000; | 275 | size += 0x10000; |
@@ -321,5 +321,5 @@ void pdacf_tasklet(unsigned long private_data) | |||
321 | spin_lock(&chip->reg_lock); | 321 | spin_lock(&chip->reg_lock); |
322 | } | 322 | } |
323 | spin_unlock(&chip->reg_lock); | 323 | spin_unlock(&chip->reg_lock); |
324 | // printk("TASKLET: end\n"); | 324 | /* printk(KERN_DEBUG "TASKLET: end\n"); */ |
325 | } | 325 | } |
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, | |||
954 | amd->regs = of_ioremap(&op->resource[0], 0, | 954 | amd->regs = of_ioremap(&op->resource[0], 0, |
955 | resource_size(&op->resource[0]), "amd7930"); | 955 | resource_size(&op->resource[0]), "amd7930"); |
956 | if (!amd->regs) { | 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 | return -EIO; | 959 | return -EIO; |
959 | } | 960 | } |
960 | 961 | ||
@@ -962,7 +963,7 @@ static int __devinit snd_amd7930_create(struct snd_card *card, | |||
962 | 963 | ||
963 | if (request_irq(irq, snd_amd7930_interrupt, | 964 | if (request_irq(irq, snd_amd7930_interrupt, |
964 | IRQF_DISABLED | IRQF_SHARED, "amd7930", amd)) { | 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 | dev, irq); | 967 | dev, irq); |
967 | snd_amd7930_free(amd); | 968 | snd_amd7930_free(amd); |
968 | return -EBUSY; | 969 | return -EBUSY; |