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/trident | |
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/trident')
-rw-r--r-- | sound/pci/trident/trident_main.c | 12 | ||||
-rw-r--r-- | sound/pci/trident/trident_memory.c | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c index dda62955b4fe..08226f523eb8 100644 --- a/sound/pci/trident/trident_main.c +++ b/sound/pci/trident/trident_main.c | |||
@@ -153,7 +153,7 @@ static unsigned short snd_trident_codec_read(ac97_t *ac97, unsigned short reg) | |||
153 | } | 153 | } |
154 | 154 | ||
155 | if (count == 0 && !trident->ac97_detect) { | 155 | if (count == 0 && !trident->ac97_detect) { |
156 | snd_printk("ac97 codec read TIMEOUT [0x%x/0x%x]!!!\n", reg, data); | 156 | snd_printk(KERN_ERR "ac97 codec read TIMEOUT [0x%x/0x%x]!!!\n", reg, data); |
157 | data = 0; | 157 | data = 0; |
158 | } | 158 | } |
159 | 159 | ||
@@ -2990,13 +2990,13 @@ static int __devinit snd_trident_mixer(trident_t * trident, int pcm_spdif_device | |||
2990 | _ac97.num = 1; | 2990 | _ac97.num = 1; |
2991 | err = snd_ac97_mixer(trident->ac97_bus, &_ac97, &trident->ac97_sec); | 2991 | err = snd_ac97_mixer(trident->ac97_bus, &_ac97, &trident->ac97_sec); |
2992 | if (err < 0) | 2992 | if (err < 0) |
2993 | snd_printk("SI7018: the secondary codec - invalid access\n"); | 2993 | snd_printk(KERN_ERR "SI7018: the secondary codec - invalid access\n"); |
2994 | #if 0 // only for my testing purpose --jk | 2994 | #if 0 // only for my testing purpose --jk |
2995 | { | 2995 | { |
2996 | ac97_t *mc97; | 2996 | ac97_t *mc97; |
2997 | err = snd_ac97_modem(trident->card, &_ac97, &mc97); | 2997 | err = snd_ac97_modem(trident->card, &_ac97, &mc97); |
2998 | if (err < 0) | 2998 | if (err < 0) |
2999 | snd_printk("snd_ac97_modem returned error %i\n", err); | 2999 | snd_printk(KERN_ERR "snd_ac97_modem returned error %i\n", err); |
3000 | } | 3000 | } |
3001 | #endif | 3001 | #endif |
3002 | } | 3002 | } |
@@ -3244,7 +3244,7 @@ static int snd_trident_sis_reset(trident_t *trident) | |||
3244 | goto __si7018_ok; | 3244 | goto __si7018_ok; |
3245 | do_delay(trident); | 3245 | do_delay(trident); |
3246 | } while (time_after_eq(end_time, jiffies)); | 3246 | } while (time_after_eq(end_time, jiffies)); |
3247 | snd_printk("AC'97 codec ready error [0x%x]\n", inl(TRID_REG(trident, SI_SERIAL_INTF_CTRL))); | 3247 | snd_printk(KERN_ERR "AC'97 codec ready error [0x%x]\n", inl(TRID_REG(trident, SI_SERIAL_INTF_CTRL))); |
3248 | if (r-- > 0) { | 3248 | if (r-- > 0) { |
3249 | end_time = jiffies + HZ; | 3249 | end_time = jiffies + HZ; |
3250 | do { | 3250 | do { |
@@ -3542,7 +3542,7 @@ int __devinit snd_trident_create(snd_card_t * card, | |||
3542 | /* check, if we can restrict PCI DMA transfers to 30 bits */ | 3542 | /* check, if we can restrict PCI DMA transfers to 30 bits */ |
3543 | if (pci_set_dma_mask(pci, 0x3fffffff) < 0 || | 3543 | if (pci_set_dma_mask(pci, 0x3fffffff) < 0 || |
3544 | pci_set_consistent_dma_mask(pci, 0x3fffffff) < 0) { | 3544 | pci_set_consistent_dma_mask(pci, 0x3fffffff) < 0) { |
3545 | snd_printk("architecture does not support 30bit PCI busmaster DMA\n"); | 3545 | snd_printk(KERN_ERR "architecture does not support 30bit PCI busmaster DMA\n"); |
3546 | pci_disable_device(pci); | 3546 | pci_disable_device(pci); |
3547 | return -ENXIO; | 3547 | return -ENXIO; |
3548 | } | 3548 | } |
@@ -3579,7 +3579,7 @@ int __devinit snd_trident_create(snd_card_t * card, | |||
3579 | trident->port = pci_resource_start(pci, 0); | 3579 | trident->port = pci_resource_start(pci, 0); |
3580 | 3580 | ||
3581 | if (request_irq(pci->irq, snd_trident_interrupt, SA_INTERRUPT|SA_SHIRQ, "Trident Audio", (void *) trident)) { | 3581 | if (request_irq(pci->irq, snd_trident_interrupt, SA_INTERRUPT|SA_SHIRQ, "Trident Audio", (void *) trident)) { |
3582 | snd_printk("unable to grab IRQ %d\n", pci->irq); | 3582 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
3583 | snd_trident_free(trident); | 3583 | snd_trident_free(trident); |
3584 | return -EBUSY; | 3584 | return -EBUSY; |
3585 | } | 3585 | } |
diff --git a/sound/pci/trident/trident_memory.c b/sound/pci/trident/trident_memory.c index 333d3790692a..f3e6c546af74 100644 --- a/sound/pci/trident/trident_memory.c +++ b/sound/pci/trident/trident_memory.c | |||
@@ -170,11 +170,11 @@ __found_pages: | |||
170 | static int is_valid_page(unsigned long ptr) | 170 | static int is_valid_page(unsigned long ptr) |
171 | { | 171 | { |
172 | if (ptr & ~0x3fffffffUL) { | 172 | if (ptr & ~0x3fffffffUL) { |
173 | snd_printk("max memory size is 1GB!!\n"); | 173 | snd_printk(KERN_ERR "max memory size is 1GB!!\n"); |
174 | return 0; | 174 | return 0; |
175 | } | 175 | } |
176 | if (ptr & (SNDRV_TRIDENT_PAGE_SIZE-1)) { | 176 | if (ptr & (SNDRV_TRIDENT_PAGE_SIZE-1)) { |
177 | snd_printk("page is not aligned\n"); | 177 | snd_printk(KERN_ERR "page is not aligned\n"); |
178 | return 0; | 178 | return 0; |
179 | } | 179 | } |
180 | return 1; | 180 | return 1; |