diff options
author | Takashi Iwai <tiwai@suse.de> | 2005-10-20 12:26:44 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2005-11-04 07:19:23 -0500 |
commit | 99b359ba10a582148c6725f428a33ba5356dd993 (patch) | |
tree | 15927b52d1b02830a9197bea7806545ffef0749f /sound/pci/ali5451/ali5451.c | |
parent | 8a3fb4d0ce5cc37a765d59b65a3b3714e5806dc9 (diff) |
[ALSA] Add missing KERN_* suffix to printk
Add missing KERN_* suffix to printk.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/ali5451/ali5451.c')
-rw-r--r-- | sound/pci/ali5451/ali5451.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c index 1f747c3034fe..e33653439cb5 100644 --- a/sound/pci/ali5451/ali5451.c +++ b/sound/pci/ali5451/ali5451.c | |||
@@ -426,7 +426,7 @@ static int snd_ali_stimer_ready(ali_t *codec, int sched) | |||
426 | schedule_timeout(1); | 426 | schedule_timeout(1); |
427 | } | 427 | } |
428 | } while (time_after_eq(end_time, jiffies)); | 428 | } while (time_after_eq(end_time, jiffies)); |
429 | snd_printk("ali_stimer_read: stimer is not ready.\n"); | 429 | snd_printk(KERN_ERR "ali_stimer_read: stimer is not ready.\n"); |
430 | return -EIO; | 430 | return -EIO; |
431 | } | 431 | } |
432 | 432 | ||
@@ -438,7 +438,7 @@ static void snd_ali_codec_poke(ali_t *codec,int secondary, | |||
438 | unsigned int port = 0; | 438 | unsigned int port = 0; |
439 | 439 | ||
440 | if (reg >= 0x80) { | 440 | if (reg >= 0x80) { |
441 | snd_printk("ali_codec_poke: reg(%xh) invalid.\n", reg); | 441 | snd_printk(KERN_ERR "ali_codec_poke: reg(%xh) invalid.\n", reg); |
442 | return; | 442 | return; |
443 | } | 443 | } |
444 | 444 | ||
@@ -467,7 +467,7 @@ static unsigned short snd_ali_codec_peek( ali_t *codec, | |||
467 | unsigned int port = 0; | 467 | unsigned int port = 0; |
468 | 468 | ||
469 | if (reg >= 0x80) { | 469 | if (reg >= 0x80) { |
470 | snd_printk("ali_codec_peek: reg(%xh) invalid.\n", reg); | 470 | snd_printk(KERN_ERR "ali_codec_peek: reg(%xh) invalid.\n", reg); |
471 | return ~0; | 471 | return ~0; |
472 | } | 472 | } |
473 | 473 | ||
@@ -671,7 +671,7 @@ static int snd_ali_alloc_pcm_channel(ali_t *codec, int channel) | |||
671 | unsigned int idx = channel & 0x1f; | 671 | unsigned int idx = channel & 0x1f; |
672 | 672 | ||
673 | if (codec->synth.chcnt >= ALI_CHANNELS){ | 673 | if (codec->synth.chcnt >= ALI_CHANNELS){ |
674 | snd_printk("ali_alloc_pcm_channel: no free channels.\n"); | 674 | snd_printk(KERN_ERR "ali_alloc_pcm_channel: no free channels.\n"); |
675 | return -1; | 675 | return -1; |
676 | } | 676 | } |
677 | 677 | ||
@@ -702,7 +702,7 @@ static int snd_ali_find_free_channel(ali_t * codec, int rec) | |||
702 | if ((result = snd_ali_alloc_pcm_channel(codec,idx)) >= 0) { | 702 | if ((result = snd_ali_alloc_pcm_channel(codec,idx)) >= 0) { |
703 | return result; | 703 | return result; |
704 | } else { | 704 | } else { |
705 | snd_printk("ali_find_free_channel: record channel is busy now.\n"); | 705 | snd_printk(KERN_ERR "ali_find_free_channel: record channel is busy now.\n"); |
706 | return -1; | 706 | return -1; |
707 | } | 707 | } |
708 | } | 708 | } |
@@ -714,7 +714,7 @@ static int snd_ali_find_free_channel(ali_t * codec, int rec) | |||
714 | if ((result = snd_ali_alloc_pcm_channel(codec,idx)) >= 0) { | 714 | if ((result = snd_ali_alloc_pcm_channel(codec,idx)) >= 0) { |
715 | return result; | 715 | return result; |
716 | } else { | 716 | } else { |
717 | snd_printk("ali_find_free_channel: S/PDIF out channel is in busy now.\n"); | 717 | snd_printk(KERN_ERR "ali_find_free_channel: S/PDIF out channel is in busy now.\n"); |
718 | } | 718 | } |
719 | } | 719 | } |
720 | 720 | ||
@@ -722,7 +722,7 @@ static int snd_ali_find_free_channel(ali_t * codec, int rec) | |||
722 | if ((result = snd_ali_alloc_pcm_channel(codec,idx)) >= 0) | 722 | if ((result = snd_ali_alloc_pcm_channel(codec,idx)) >= 0) |
723 | return result; | 723 | return result; |
724 | } | 724 | } |
725 | snd_printk("ali_find_free_channel: no free channels.\n"); | 725 | snd_printk(KERN_ERR "ali_find_free_channel: no free channels.\n"); |
726 | return -1; | 726 | return -1; |
727 | } | 727 | } |
728 | 728 | ||
@@ -736,7 +736,7 @@ static void snd_ali_free_channel_pcm(ali_t *codec, int channel) | |||
736 | return; | 736 | return; |
737 | 737 | ||
738 | if (!(codec->synth.chmap & (1 << idx))) { | 738 | if (!(codec->synth.chmap & (1 << idx))) { |
739 | snd_printk("ali_free_channel_pcm: channel %d is not in use.\n",channel); | 739 | snd_printk(KERN_ERR "ali_free_channel_pcm: channel %d is not in use.\n",channel); |
740 | return; | 740 | return; |
741 | } else { | 741 | } else { |
742 | codec->synth.chmap &= ~(1 << idx); | 742 | codec->synth.chmap &= ~(1 << idx); |
@@ -798,7 +798,7 @@ static void snd_ali_detect_spdif_rate(ali_t *codec) | |||
798 | } | 798 | } |
799 | 799 | ||
800 | if (count > 50000) { | 800 | if (count > 50000) { |
801 | snd_printk("ali_detect_spdif_rate: timeout!\n"); | 801 | snd_printk(KERN_ERR "ali_detect_spdif_rate: timeout!\n"); |
802 | return; | 802 | return; |
803 | } | 803 | } |
804 | 804 | ||
@@ -811,7 +811,7 @@ static void snd_ali_detect_spdif_rate(ali_t *codec) | |||
811 | } | 811 | } |
812 | 812 | ||
813 | if (count > 50000) { | 813 | if (count > 50000) { |
814 | snd_printk("ali_detect_spdif_rate: timeout!\n"); | 814 | snd_printk(KERN_ERR "ali_detect_spdif_rate: timeout!\n"); |
815 | return; | 815 | return; |
816 | } | 816 | } |
817 | 817 | ||
@@ -1079,7 +1079,7 @@ static snd_ali_voice_t *snd_ali_alloc_voice(ali_t * codec, int type, int rec, in | |||
1079 | idx = channel > 0 ? snd_ali_alloc_pcm_channel(codec, channel) : | 1079 | idx = channel > 0 ? snd_ali_alloc_pcm_channel(codec, channel) : |
1080 | snd_ali_find_free_channel(codec,rec); | 1080 | snd_ali_find_free_channel(codec,rec); |
1081 | if(idx < 0) { | 1081 | if(idx < 0) { |
1082 | snd_printk("ali_alloc_voice: err.\n"); | 1082 | snd_printk(KERN_ERR "ali_alloc_voice: err.\n"); |
1083 | spin_unlock_irqrestore(&codec->voice_alloc, flags); | 1083 | spin_unlock_irqrestore(&codec->voice_alloc, flags); |
1084 | return NULL; | 1084 | return NULL; |
1085 | } | 1085 | } |
@@ -1481,13 +1481,13 @@ static int snd_ali_prepare(snd_pcm_substream_t * substream) | |||
1481 | } | 1481 | } |
1482 | rate = snd_ali_get_spdif_in_rate(codec); | 1482 | rate = snd_ali_get_spdif_in_rate(codec); |
1483 | if (rate == 0) { | 1483 | if (rate == 0) { |
1484 | snd_printk("ali_capture_preapre: spdif rate detect err!\n"); | 1484 | snd_printk(KERN_WARNING "ali_capture_preapre: spdif rate detect err!\n"); |
1485 | rate = 48000; | 1485 | rate = 48000; |
1486 | } | 1486 | } |
1487 | bValue = inb(ALI_REG(codec,ALI_SPDIF_CTRL)); | 1487 | bValue = inb(ALI_REG(codec,ALI_SPDIF_CTRL)); |
1488 | if (bValue & 0x10) { | 1488 | if (bValue & 0x10) { |
1489 | outb(bValue,ALI_REG(codec,ALI_SPDIF_CTRL)); | 1489 | outb(bValue,ALI_REG(codec,ALI_SPDIF_CTRL)); |
1490 | printk("clear SPDIF parity error flag.\n"); | 1490 | printk(KERN_WARNING "clear SPDIF parity error flag.\n"); |
1491 | } | 1491 | } |
1492 | 1492 | ||
1493 | if (rate != 48000) | 1493 | if (rate != 48000) |
@@ -1816,7 +1816,7 @@ static int __devinit snd_ali_pcm(ali_t * codec, int device, struct ali_pcm_descr | |||
1816 | err = snd_pcm_new(codec->card, desc->name, device, | 1816 | err = snd_pcm_new(codec->card, desc->name, device, |
1817 | desc->playback_num, desc->capture_num, &pcm); | 1817 | desc->playback_num, desc->capture_num, &pcm); |
1818 | if (err < 0) { | 1818 | if (err < 0) { |
1819 | snd_printk("snd_ali_pcm: err called snd_pcm_new.\n"); | 1819 | snd_printk(KERN_ERR "snd_ali_pcm: err called snd_pcm_new.\n"); |
1820 | return err; | 1820 | return err; |
1821 | } | 1821 | } |
1822 | pcm->private_data = codec; | 1822 | pcm->private_data = codec; |
@@ -1994,7 +1994,7 @@ static int __devinit snd_ali_mixer(ali_t * codec) | |||
1994 | for ( i = 0 ; i < codec->num_of_codecs ; i++) { | 1994 | for ( i = 0 ; i < codec->num_of_codecs ; i++) { |
1995 | ac97.num = i; | 1995 | ac97.num = i; |
1996 | if ((err = snd_ac97_mixer(codec->ac97_bus, &ac97, &codec->ac97[i])) < 0) { | 1996 | if ((err = snd_ac97_mixer(codec->ac97_bus, &ac97, &codec->ac97[i])) < 0) { |
1997 | snd_printk("ali mixer %d creating error.\n", i); | 1997 | snd_printk(KERN_ERR "ali mixer %d creating error.\n", i); |
1998 | if(i == 0) | 1998 | if(i == 0) |
1999 | return err; | 1999 | return err; |
2000 | codec->num_of_codecs = 1; | 2000 | codec->num_of_codecs = 1; |
@@ -2128,7 +2128,7 @@ static int snd_ali_chip_init(ali_t *codec) | |||
2128 | snd_ali_printk("chip initializing ... \n"); | 2128 | snd_ali_printk("chip initializing ... \n"); |
2129 | 2129 | ||
2130 | if (snd_ali_reset_5451(codec)) { | 2130 | if (snd_ali_reset_5451(codec)) { |
2131 | snd_printk("ali_chip_init: reset 5451 error.\n"); | 2131 | snd_printk(KERN_ERR "ali_chip_init: reset 5451 error.\n"); |
2132 | return -1; | 2132 | return -1; |
2133 | } | 2133 | } |
2134 | 2134 | ||
@@ -2203,7 +2203,7 @@ static int __devinit snd_ali_resources(ali_t *codec) | |||
2203 | codec->port = pci_resource_start(codec->pci, 0); | 2203 | codec->port = pci_resource_start(codec->pci, 0); |
2204 | 2204 | ||
2205 | if (request_irq(codec->pci->irq, snd_ali_card_interrupt, SA_INTERRUPT|SA_SHIRQ, "ALI 5451", (void *)codec)) { | 2205 | if (request_irq(codec->pci->irq, snd_ali_card_interrupt, SA_INTERRUPT|SA_SHIRQ, "ALI 5451", (void *)codec)) { |
2206 | snd_printk("Unable to request irq.\n"); | 2206 | snd_printk(KERN_ERR "Unable to request irq.\n"); |
2207 | return -EBUSY; | 2207 | return -EBUSY; |
2208 | } | 2208 | } |
2209 | codec->irq = codec->pci->irq; | 2209 | codec->irq = codec->pci->irq; |
@@ -2243,7 +2243,7 @@ static int __devinit snd_ali_create(snd_card_t * card, | |||
2243 | /* check, if we can restrict PCI DMA transfers to 31 bits */ | 2243 | /* check, if we can restrict PCI DMA transfers to 31 bits */ |
2244 | if (pci_set_dma_mask(pci, 0x7fffffff) < 0 || | 2244 | if (pci_set_dma_mask(pci, 0x7fffffff) < 0 || |
2245 | pci_set_consistent_dma_mask(pci, 0x7fffffff) < 0) { | 2245 | pci_set_consistent_dma_mask(pci, 0x7fffffff) < 0) { |
2246 | snd_printk("architecture does not support 31bit PCI busmaster DMA\n"); | 2246 | snd_printk(KERN_ERR "architecture does not support 31bit PCI busmaster DMA\n"); |
2247 | pci_disable_device(pci); | 2247 | pci_disable_device(pci); |
2248 | return -ENXIO; | 2248 | return -ENXIO; |
2249 | } | 2249 | } |
@@ -2332,7 +2332,7 @@ static int __devinit snd_ali_create(snd_card_t * card, | |||
2332 | } | 2332 | } |
2333 | 2333 | ||
2334 | if ((err = snd_ali_chip_init(codec)) < 0) { | 2334 | if ((err = snd_ali_chip_init(codec)) < 0) { |
2335 | snd_printk("ali create: chip init error.\n"); | 2335 | snd_printk(KERN_ERR "ali create: chip init error.\n"); |
2336 | return err; | 2336 | return err; |
2337 | } | 2337 | } |
2338 | 2338 | ||