aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/nm256
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2005-10-20 12:26:44 -0400
committerJaroslav Kysela <perex@suse.cz>2005-11-04 07:19:23 -0500
commit99b359ba10a582148c6725f428a33ba5356dd993 (patch)
tree15927b52d1b02830a9197bea7806545ffef0749f /sound/pci/nm256
parent8a3fb4d0ce5cc37a765d59b65a3b3714e5806dc9 (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/nm256')
-rw-r--r--sound/pci/nm256/nm256.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/sound/pci/nm256/nm256.c b/sound/pci/nm256/nm256.c
index cccdc576b8a3..e7aa15178453 100644
--- a/sound/pci/nm256/nm256.c
+++ b/sound/pci/nm256/nm256.c
@@ -320,9 +320,9 @@ static inline void
320snd_nm256_write_buffer(nm256_t *chip, void *src, int offset, int size) 320snd_nm256_write_buffer(nm256_t *chip, void *src, int offset, int size)
321{ 321{
322 offset -= chip->buffer_start; 322 offset -= chip->buffer_start;
323#ifdef SNDRV_CONFIG_DEBUG 323#ifdef CONFIG_SND_DEBUG
324 if (offset < 0 || offset >= chip->buffer_size) { 324 if (offset < 0 || offset >= chip->buffer_size) {
325 snd_printk("write_buffer invalid offset = %d size = %d\n", offset, size); 325 snd_printk(KERN_ERR "write_buffer invalid offset = %d size = %d\n", offset, size);
326 return; 326 return;
327 } 327 }
328#endif 328#endif
@@ -466,7 +466,7 @@ static int snd_nm256_acquire_irq(nm256_t *chip)
466 if (chip->irq < 0) { 466 if (chip->irq < 0) {
467 if (request_irq(chip->pci->irq, chip->interrupt, SA_INTERRUPT|SA_SHIRQ, 467 if (request_irq(chip->pci->irq, chip->interrupt, SA_INTERRUPT|SA_SHIRQ,
468 chip->card->driver, (void*)chip)) { 468 chip->card->driver, (void*)chip)) {
469 snd_printk("unable to grab IRQ %d\n", chip->pci->irq); 469 snd_printk(KERN_ERR "unable to grab IRQ %d\n", chip->pci->irq);
470 up(&chip->irq_mutex); 470 up(&chip->irq_mutex);
471 return -EBUSY; 471 return -EBUSY;
472 } 472 }
@@ -1273,7 +1273,7 @@ snd_nm256_peek_for_sig(nm256_t *chip)
1273 1273
1274 temp = ioremap_nocache(chip->buffer_addr + chip->buffer_end - 0x400, 16); 1274 temp = ioremap_nocache(chip->buffer_addr + chip->buffer_end - 0x400, 16);
1275 if (temp == NULL) { 1275 if (temp == NULL) {
1276 snd_printk("Unable to scan for card signature in video RAM\n"); 1276 snd_printk(KERN_ERR "Unable to scan for card signature in video RAM\n");
1277 return -EBUSY; 1277 return -EBUSY;
1278 } 1278 }
1279 1279
@@ -1287,7 +1287,7 @@ snd_nm256_peek_for_sig(nm256_t *chip)
1287 if (pointer == 0xffffffff || 1287 if (pointer == 0xffffffff ||
1288 pointer < chip->buffer_size || 1288 pointer < chip->buffer_size ||
1289 pointer > chip->buffer_end) { 1289 pointer > chip->buffer_end) {
1290 snd_printk("invalid signature found: 0x%x\n", pointer); 1290 snd_printk(KERN_ERR "invalid signature found: 0x%x\n", pointer);
1291 iounmap(temp); 1291 iounmap(temp);
1292 return -ENODEV; 1292 return -ENODEV;
1293 } else { 1293 } else {
@@ -1424,14 +1424,14 @@ snd_nm256_create(snd_card_t *card, struct pci_dev *pci,
1424 chip->res_cport = request_mem_region(chip->cport_addr, NM_PORT2_SIZE, 1424 chip->res_cport = request_mem_region(chip->cport_addr, NM_PORT2_SIZE,
1425 card->driver); 1425 card->driver);
1426 if (chip->res_cport == NULL) { 1426 if (chip->res_cport == NULL) {
1427 snd_printk("memory region 0x%lx (size 0x%x) busy\n", 1427 snd_printk(KERN_ERR "memory region 0x%lx (size 0x%x) busy\n",
1428 chip->cport_addr, NM_PORT2_SIZE); 1428 chip->cport_addr, NM_PORT2_SIZE);
1429 err = -EBUSY; 1429 err = -EBUSY;
1430 goto __error; 1430 goto __error;
1431 } 1431 }
1432 chip->cport = ioremap_nocache(chip->cport_addr, NM_PORT2_SIZE); 1432 chip->cport = ioremap_nocache(chip->cport_addr, NM_PORT2_SIZE);
1433 if (chip->cport == NULL) { 1433 if (chip->cport == NULL) {
1434 snd_printk("unable to map control port %lx\n", chip->cport_addr); 1434 snd_printk(KERN_ERR "unable to map control port %lx\n", chip->cport_addr);
1435 err = -ENOMEM; 1435 err = -ENOMEM;
1436 goto __error; 1436 goto __error;
1437 } 1437 }
@@ -1489,7 +1489,7 @@ snd_nm256_create(snd_card_t *card, struct pci_dev *pci,
1489 chip->buffer_size, 1489 chip->buffer_size,
1490 card->driver); 1490 card->driver);
1491 if (chip->res_buffer == NULL) { 1491 if (chip->res_buffer == NULL) {
1492 snd_printk("nm256: buffer 0x%lx (size 0x%x) busy\n", 1492 snd_printk(KERN_ERR "nm256: buffer 0x%lx (size 0x%x) busy\n",
1493 chip->buffer_addr, chip->buffer_size); 1493 chip->buffer_addr, chip->buffer_size);
1494 err = -EBUSY; 1494 err = -EBUSY;
1495 goto __error; 1495 goto __error;
@@ -1497,7 +1497,7 @@ snd_nm256_create(snd_card_t *card, struct pci_dev *pci,
1497 chip->buffer = ioremap_nocache(chip->buffer_addr, chip->buffer_size); 1497 chip->buffer = ioremap_nocache(chip->buffer_addr, chip->buffer_size);
1498 if (chip->buffer == NULL) { 1498 if (chip->buffer == NULL) {
1499 err = -ENOMEM; 1499 err = -ENOMEM;
1500 snd_printk("unable to map ring buffer at %lx\n", chip->buffer_addr); 1500 snd_printk(KERN_ERR "unable to map ring buffer at %lx\n", chip->buffer_addr);
1501 goto __error; 1501 goto __error;
1502 } 1502 }
1503 1503
@@ -1605,7 +1605,7 @@ static int __devinit snd_nm256_probe(struct pci_dev *pci,
1605 strcpy(card->driver, "NM256XL+"); 1605 strcpy(card->driver, "NM256XL+");
1606 break; 1606 break;
1607 default: 1607 default:
1608 snd_printk("invalid device id 0x%x\n", pci->device); 1608 snd_printk(KERN_ERR "invalid device id 0x%x\n", pci->device);
1609 snd_card_free(card); 1609 snd_card_free(card);
1610 return -EINVAL; 1610 return -EINVAL;
1611 } 1611 }