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/isa/sb | |
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/isa/sb')
-rw-r--r-- | sound/isa/sb/emu8000_synth.c | 2 | ||||
-rw-r--r-- | sound/isa/sb/sb16_main.c | 8 | ||||
-rw-r--r-- | sound/isa/sb/sb8_main.c | 3 | ||||
-rw-r--r-- | sound/isa/sb/sb_common.c | 6 | ||||
-rw-r--r-- | sound/isa/sb/sb_mixer.c | 4 |
5 files changed, 10 insertions, 13 deletions
diff --git a/sound/isa/sb/emu8000_synth.c b/sound/isa/sb/emu8000_synth.c index 1f63aa52d596..f68e217416a6 100644 --- a/sound/isa/sb/emu8000_synth.c +++ b/sound/isa/sb/emu8000_synth.c | |||
@@ -56,7 +56,7 @@ static int snd_emu8000_new_device(snd_seq_device_t *dev) | |||
56 | emu->num_ports = hw->seq_ports; | 56 | emu->num_ports = hw->seq_ports; |
57 | 57 | ||
58 | if (hw->memhdr) { | 58 | if (hw->memhdr) { |
59 | snd_printk("memhdr is already initialized!?\n"); | 59 | snd_printk(KERN_ERR "memhdr is already initialized!?\n"); |
60 | snd_util_memhdr_free(hw->memhdr); | 60 | snd_util_memhdr_free(hw->memhdr); |
61 | } | 61 | } |
62 | hw->memhdr = snd_util_memhdr_new(hw->mem_size); | 62 | hw->memhdr = snd_util_memhdr_new(hw->mem_size); |
diff --git a/sound/isa/sb/sb16_main.c b/sound/isa/sb/sb16_main.c index a99e642a68b5..556b95e3e22f 100644 --- a/sound/isa/sb/sb16_main.c +++ b/sound/isa/sb/sb16_main.c | |||
@@ -747,7 +747,7 @@ int snd_sb16dsp_configure(sb_t * chip) | |||
747 | unsigned char realirq, realdma, realmpureg; | 747 | unsigned char realirq, realdma, realmpureg; |
748 | /* note: mpu register should be present only on SB16 Vibra soundcards */ | 748 | /* note: mpu register should be present only on SB16 Vibra soundcards */ |
749 | 749 | ||
750 | // printk("codec->irq=%i, codec->dma8=%i, codec->dma16=%i\n", chip->irq, chip->dma8, chip->dma16); | 750 | // printk(KERN_DEBUG "codec->irq=%i, codec->dma8=%i, codec->dma16=%i\n", chip->irq, chip->dma8, chip->dma16); |
751 | spin_lock_irqsave(&chip->mixer_lock, flags); | 751 | spin_lock_irqsave(&chip->mixer_lock, flags); |
752 | mpureg = snd_sbmixer_read(chip, SB_DSP4_MPUSETUP) & ~0x06; | 752 | mpureg = snd_sbmixer_read(chip, SB_DSP4_MPUSETUP) & ~0x06; |
753 | spin_unlock_irqrestore(&chip->mixer_lock, flags); | 753 | spin_unlock_irqrestore(&chip->mixer_lock, flags); |
@@ -821,9 +821,9 @@ int snd_sb16dsp_configure(sb_t * chip) | |||
821 | 821 | ||
822 | spin_unlock_irqrestore(&chip->mixer_lock, flags); | 822 | spin_unlock_irqrestore(&chip->mixer_lock, flags); |
823 | if ((~realirq) & irqreg || (~realdma) & dmareg) { | 823 | if ((~realirq) & irqreg || (~realdma) & dmareg) { |
824 | snd_printk("SB16 [0x%lx]: unable to set DMA & IRQ (PnP device?)\n", chip->port); | 824 | snd_printk(KERN_ERR "SB16 [0x%lx]: unable to set DMA & IRQ (PnP device?)\n", chip->port); |
825 | snd_printk("SB16 [0x%lx]: wanted: irqreg=0x%x, dmareg=0x%x, mpureg = 0x%x\n", chip->port, realirq, realdma, realmpureg); | 825 | snd_printk(KERN_ERR "SB16 [0x%lx]: wanted: irqreg=0x%x, dmareg=0x%x, mpureg = 0x%x\n", chip->port, realirq, realdma, realmpureg); |
826 | snd_printk("SB16 [0x%lx]: got: irqreg=0x%x, dmareg=0x%x, mpureg = 0x%x\n", chip->port, irqreg, dmareg, mpureg); | 826 | snd_printk(KERN_ERR "SB16 [0x%lx]: got: irqreg=0x%x, dmareg=0x%x, mpureg = 0x%x\n", chip->port, irqreg, dmareg, mpureg); |
827 | return -ENODEV; | 827 | return -ENODEV; |
828 | } | 828 | } |
829 | return 0; | 829 | return 0; |
diff --git a/sound/isa/sb/sb8_main.c b/sound/isa/sb/sb8_main.c index 87c9b1ba06cf..5ddc6e41d909 100644 --- a/sound/isa/sb/sb8_main.c +++ b/sound/isa/sb/sb8_main.c | |||
@@ -334,9 +334,6 @@ irqreturn_t snd_sb8dsp_interrupt(sb_t *chip) | |||
334 | snd_pcm_substream_t *substream; | 334 | snd_pcm_substream_t *substream; |
335 | snd_pcm_runtime_t *runtime; | 335 | snd_pcm_runtime_t *runtime; |
336 | 336 | ||
337 | #if 0 | ||
338 | snd_printk("sb8: interrupt\n"); | ||
339 | #endif | ||
340 | snd_sb_ack_8bit(chip); | 337 | snd_sb_ack_8bit(chip); |
341 | switch (chip->mode) { | 338 | switch (chip->mode) { |
342 | case SB_MODE_PLAYBACK_8: /* ok.. playback is active */ | 339 | case SB_MODE_PLAYBACK_8: /* ok.. playback is active */ |
diff --git a/sound/isa/sb/sb_common.c b/sound/isa/sb/sb_common.c index 46b9480669f9..603e923b5d2f 100644 --- a/sound/isa/sb/sb_common.c +++ b/sound/isa/sb/sb_common.c | |||
@@ -45,7 +45,7 @@ int snd_sbdsp_command(sb_t *chip, unsigned char val) | |||
45 | { | 45 | { |
46 | int i; | 46 | int i; |
47 | #ifdef IO_DEBUG | 47 | #ifdef IO_DEBUG |
48 | snd_printk("command 0x%x\n", val); | 48 | snd_printk(KERN_DEBUG "command 0x%x\n", val); |
49 | #endif | 49 | #endif |
50 | for (i = BUSY_LOOPS; i; i--) | 50 | for (i = BUSY_LOOPS; i; i--) |
51 | if ((inb(SBP(chip, STATUS)) & 0x80) == 0) { | 51 | if ((inb(SBP(chip, STATUS)) & 0x80) == 0) { |
@@ -64,7 +64,7 @@ int snd_sbdsp_get_byte(sb_t *chip) | |||
64 | if (inb(SBP(chip, DATA_AVAIL)) & 0x80) { | 64 | if (inb(SBP(chip, DATA_AVAIL)) & 0x80) { |
65 | val = inb(SBP(chip, READ)); | 65 | val = inb(SBP(chip, READ)); |
66 | #ifdef IO_DEBUG | 66 | #ifdef IO_DEBUG |
67 | snd_printk("get_byte 0x%x\n", val); | 67 | snd_printk(KERN_DEBUG "get_byte 0x%x\n", val); |
68 | #endif | 68 | #endif |
69 | return val; | 69 | return val; |
70 | } | 70 | } |
@@ -154,7 +154,7 @@ static int snd_sbdsp_probe(sb_t * chip) | |||
154 | str = "16"; | 154 | str = "16"; |
155 | break; | 155 | break; |
156 | default: | 156 | default: |
157 | snd_printk("SB [0x%lx]: unknown DSP chip version %i.%i\n", | 157 | snd_printk(KERN_INFO "SB [0x%lx]: unknown DSP chip version %i.%i\n", |
158 | chip->port, major, minor); | 158 | chip->port, major, minor); |
159 | return -ENODEV; | 159 | return -ENODEV; |
160 | } | 160 | } |
diff --git a/sound/isa/sb/sb_mixer.c b/sound/isa/sb/sb_mixer.c index ff4b59968027..5a926a452d38 100644 --- a/sound/isa/sb/sb_mixer.c +++ b/sound/isa/sb/sb_mixer.c | |||
@@ -36,7 +36,7 @@ void snd_sbmixer_write(sb_t *chip, unsigned char reg, unsigned char data) | |||
36 | outb(data, SBP(chip, MIXER_DATA)); | 36 | outb(data, SBP(chip, MIXER_DATA)); |
37 | udelay(10); | 37 | udelay(10); |
38 | #ifdef IO_DEBUG | 38 | #ifdef IO_DEBUG |
39 | snd_printk("mixer_write 0x%x 0x%x\n", reg, data); | 39 | snd_printk(KERN_DEBUG "mixer_write 0x%x 0x%x\n", reg, data); |
40 | #endif | 40 | #endif |
41 | } | 41 | } |
42 | 42 | ||
@@ -49,7 +49,7 @@ unsigned char snd_sbmixer_read(sb_t *chip, unsigned char reg) | |||
49 | result = inb(SBP(chip, MIXER_DATA)); | 49 | result = inb(SBP(chip, MIXER_DATA)); |
50 | udelay(10); | 50 | udelay(10); |
51 | #ifdef IO_DEBUG | 51 | #ifdef IO_DEBUG |
52 | snd_printk("mixer_read 0x%x 0x%x\n", reg, result); | 52 | snd_printk(KERN_DEBUG "mixer_read 0x%x 0x%x\n", reg, result); |
53 | #endif | 53 | #endif |
54 | return result; | 54 | return result; |
55 | } | 55 | } |