diff options
60 files changed, 299 insertions, 299 deletions
diff --git a/sound/i2c/cs8427.c b/sound/i2c/cs8427.c index a21f7d541f86..21133eb6e881 100644 --- a/sound/i2c/cs8427.c +++ b/sound/i2c/cs8427.c | |||
@@ -75,7 +75,7 @@ int snd_cs8427_reg_write(snd_i2c_device_t *device, unsigned char reg, unsigned c | |||
75 | buf[0] = reg & 0x7f; | 75 | buf[0] = reg & 0x7f; |
76 | buf[1] = val; | 76 | buf[1] = val; |
77 | if ((err = snd_i2c_sendbytes(device, buf, 2)) != 2) { | 77 | if ((err = snd_i2c_sendbytes(device, buf, 2)) != 2) { |
78 | snd_printk("unable to send bytes 0x%02x:0x%02x to CS8427 (%i)\n", buf[0], buf[1], err); | 78 | snd_printk(KERN_ERR "unable to send bytes 0x%02x:0x%02x to CS8427 (%i)\n", buf[0], buf[1], err); |
79 | return err < 0 ? err : -EIO; | 79 | return err < 0 ? err : -EIO; |
80 | } | 80 | } |
81 | return 0; | 81 | return 0; |
@@ -87,11 +87,11 @@ static int snd_cs8427_reg_read(snd_i2c_device_t *device, unsigned char reg) | |||
87 | unsigned char buf; | 87 | unsigned char buf; |
88 | 88 | ||
89 | if ((err = snd_i2c_sendbytes(device, ®, 1)) != 1) { | 89 | if ((err = snd_i2c_sendbytes(device, ®, 1)) != 1) { |
90 | snd_printk("unable to send register 0x%x byte to CS8427\n", reg); | 90 | snd_printk(KERN_ERR "unable to send register 0x%x byte to CS8427\n", reg); |
91 | return err < 0 ? err : -EIO; | 91 | return err < 0 ? err : -EIO; |
92 | } | 92 | } |
93 | if ((err = snd_i2c_readbytes(device, &buf, 1)) != 1) { | 93 | if ((err = snd_i2c_readbytes(device, &buf, 1)) != 1) { |
94 | snd_printk("unable to read register 0x%x byte from CS8427\n", reg); | 94 | snd_printk(KERN_ERR "unable to read register 0x%x byte from CS8427\n", reg); |
95 | return err < 0 ? err : -EIO; | 95 | return err < 0 ? err : -EIO; |
96 | } | 96 | } |
97 | return buf; | 97 | return buf; |
@@ -210,7 +210,7 @@ int snd_cs8427_create(snd_i2c_bus_t *bus, | |||
210 | snd_i2c_lock(bus); | 210 | snd_i2c_lock(bus); |
211 | if ((err = snd_cs8427_reg_read(device, CS8427_REG_ID_AND_VER)) != CS8427_VER8427A) { | 211 | if ((err = snd_cs8427_reg_read(device, CS8427_REG_ID_AND_VER)) != CS8427_VER8427A) { |
212 | snd_i2c_unlock(bus); | 212 | snd_i2c_unlock(bus); |
213 | snd_printk("unable to find CS8427 signature (expected 0x%x, read 0x%x), initialization is not completed\n", CS8427_VER8427A, err); | 213 | snd_printk(KERN_ERR "unable to find CS8427 signature (expected 0x%x, read 0x%x), initialization is not completed\n", CS8427_VER8427A, err); |
214 | return -EFAULT; | 214 | return -EFAULT; |
215 | } | 215 | } |
216 | /* turn off run bit while making changes to configuration */ | 216 | /* turn off run bit while making changes to configuration */ |
@@ -260,7 +260,7 @@ int snd_cs8427_create(snd_i2c_bus_t *bus, | |||
260 | snd_i2c_sendbytes(device, buf, 1); | 260 | snd_i2c_sendbytes(device, buf, 1); |
261 | snd_i2c_readbytes(device, buf, 127); | 261 | snd_i2c_readbytes(device, buf, 127); |
262 | for (xx = 0; xx < 127; xx++) | 262 | for (xx = 0; xx < 127; xx++) |
263 | printk("reg[0x%x] = 0x%x\n", xx+1, buf[xx]); | 263 | printk(KERN_DEBUG "reg[0x%x] = 0x%x\n", xx+1, buf[xx]); |
264 | } | 264 | } |
265 | #endif | 265 | #endif |
266 | 266 | ||
@@ -354,12 +354,12 @@ static int snd_cs8427_qsubcode_get(snd_kcontrol_t *kcontrol, | |||
354 | 354 | ||
355 | snd_i2c_lock(device->bus); | 355 | snd_i2c_lock(device->bus); |
356 | if ((err = snd_i2c_sendbytes(device, ®, 1)) != 1) { | 356 | if ((err = snd_i2c_sendbytes(device, ®, 1)) != 1) { |
357 | snd_printk("unable to send register 0x%x byte to CS8427\n", reg); | 357 | snd_printk(KERN_ERR "unable to send register 0x%x byte to CS8427\n", reg); |
358 | snd_i2c_unlock(device->bus); | 358 | snd_i2c_unlock(device->bus); |
359 | return err < 0 ? err : -EIO; | 359 | return err < 0 ? err : -EIO; |
360 | } | 360 | } |
361 | if ((err = snd_i2c_readbytes(device, ucontrol->value.bytes.data, 10)) != 10) { | 361 | if ((err = snd_i2c_readbytes(device, ucontrol->value.bytes.data, 10)) != 10) { |
362 | snd_printk("unable to read Q-subcode bytes from CS8427\n"); | 362 | snd_printk(KERN_ERR "unable to read Q-subcode bytes from CS8427\n"); |
363 | snd_i2c_unlock(device->bus); | 363 | snd_i2c_unlock(device->bus); |
364 | return err < 0 ? err : -EIO; | 364 | return err < 0 ? err : -EIO; |
365 | } | 365 | } |
diff --git a/sound/i2c/other/ak4114.c b/sound/i2c/other/ak4114.c index af5eadcddd92..d351b3aa1916 100644 --- a/sound/i2c/other/ak4114.c +++ b/sound/i2c/other/ak4114.c | |||
@@ -56,9 +56,9 @@ static void reg_dump(ak4114_t *ak4114) | |||
56 | { | 56 | { |
57 | int i; | 57 | int i; |
58 | 58 | ||
59 | printk("AK4114 REG DUMP:\n"); | 59 | printk(KERN_DEBUG "AK4114 REG DUMP:\n"); |
60 | for (i = 0; i < 0x20; i++) | 60 | for (i = 0; i < 0x20; i++) |
61 | printk("reg[%02x] = %02x (%02x)\n", i, reg_read(ak4114, i), i < sizeof(ak4114->regmap) ? ak4114->regmap[i] : 0); | 61 | printk(KERN_DEBUG "reg[%02x] = %02x (%02x)\n", i, reg_read(ak4114, i), i < sizeof(ak4114->regmap) ? ak4114->regmap[i] : 0); |
62 | } | 62 | } |
63 | #endif | 63 | #endif |
64 | 64 | ||
@@ -552,7 +552,7 @@ int snd_ak4114_check_rate_and_errors(ak4114_t *ak4114, unsigned int flags) | |||
552 | if (!(flags & AK4114_CHECK_NO_RATE) && runtime && runtime->rate != res) { | 552 | if (!(flags & AK4114_CHECK_NO_RATE) && runtime && runtime->rate != res) { |
553 | snd_pcm_stream_lock_irqsave(ak4114->capture_substream, _flags); | 553 | snd_pcm_stream_lock_irqsave(ak4114->capture_substream, _flags); |
554 | if (snd_pcm_running(ak4114->capture_substream)) { | 554 | if (snd_pcm_running(ak4114->capture_substream)) { |
555 | // printk("rate changed (%i <- %i)\n", runtime->rate, res); | 555 | // printk(KERN_DEBUG "rate changed (%i <- %i)\n", runtime->rate, res); |
556 | snd_pcm_stop(ak4114->capture_substream, SNDRV_PCM_STATE_DRAINING); | 556 | snd_pcm_stop(ak4114->capture_substream, SNDRV_PCM_STATE_DRAINING); |
557 | res = 1; | 557 | res = 1; |
558 | } | 558 | } |
diff --git a/sound/i2c/other/ak4117.c b/sound/i2c/other/ak4117.c index d51b51dd86d6..35b4584483a3 100644 --- a/sound/i2c/other/ak4117.c +++ b/sound/i2c/other/ak4117.c | |||
@@ -54,9 +54,9 @@ static void reg_dump(ak4117_t *ak4117) | |||
54 | { | 54 | { |
55 | int i; | 55 | int i; |
56 | 56 | ||
57 | printk("AK4117 REG DUMP:\n"); | 57 | printk(KERN_DEBUG "AK4117 REG DUMP:\n"); |
58 | for (i = 0; i < 0x1b; i++) | 58 | for (i = 0; i < 0x1b; i++) |
59 | printk("reg[%02x] = %02x (%02x)\n", i, reg_read(ak4117, i), i < sizeof(ak4117->regmap) ? ak4117->regmap[i] : 0); | 59 | printk(KERN_DEBUG "reg[%02x] = %02x (%02x)\n", i, reg_read(ak4117, i), i < sizeof(ak4117->regmap) ? ak4117->regmap[i] : 0); |
60 | } | 60 | } |
61 | #endif | 61 | #endif |
62 | 62 | ||
@@ -477,7 +477,7 @@ int snd_ak4117_check_rate_and_errors(ak4117_t *ak4117, unsigned int flags) | |||
477 | goto __rate; | 477 | goto __rate; |
478 | rcs0 = reg_read(ak4117, AK4117_REG_RCS0); | 478 | rcs0 = reg_read(ak4117, AK4117_REG_RCS0); |
479 | rcs2 = reg_read(ak4117, AK4117_REG_RCS2); | 479 | rcs2 = reg_read(ak4117, AK4117_REG_RCS2); |
480 | // printk("AK IRQ: rcs0 = 0x%x, rcs1 = 0x%x, rcs2 = 0x%x\n", rcs0, rcs1, rcs2); | 480 | // printk(KERN_DEBUG "AK IRQ: rcs0 = 0x%x, rcs1 = 0x%x, rcs2 = 0x%x\n", rcs0, rcs1, rcs2); |
481 | spin_lock_irqsave(&ak4117->lock, _flags); | 481 | spin_lock_irqsave(&ak4117->lock, _flags); |
482 | if (rcs0 & AK4117_PAR) | 482 | if (rcs0 & AK4117_PAR) |
483 | ak4117->parity_errors++; | 483 | ak4117->parity_errors++; |
@@ -530,7 +530,7 @@ int snd_ak4117_check_rate_and_errors(ak4117_t *ak4117, unsigned int flags) | |||
530 | if (!(flags & AK4117_CHECK_NO_RATE) && runtime && runtime->rate != res) { | 530 | if (!(flags & AK4117_CHECK_NO_RATE) && runtime && runtime->rate != res) { |
531 | snd_pcm_stream_lock_irqsave(ak4117->substream, _flags); | 531 | snd_pcm_stream_lock_irqsave(ak4117->substream, _flags); |
532 | if (snd_pcm_running(ak4117->substream)) { | 532 | if (snd_pcm_running(ak4117->substream)) { |
533 | // printk("rate changed (%i <- %i)\n", runtime->rate, res); | 533 | // printk(KERN_DEBUG "rate changed (%i <- %i)\n", runtime->rate, res); |
534 | snd_pcm_stop(ak4117->substream, SNDRV_PCM_STATE_DRAINING); | 534 | snd_pcm_stop(ak4117->substream, SNDRV_PCM_STATE_DRAINING); |
535 | wake_up(&runtime->sleep); | 535 | wake_up(&runtime->sleep); |
536 | res = 1; | 536 | res = 1; |
diff --git a/sound/i2c/tea6330t.c b/sound/i2c/tea6330t.c index fd65da654267..4fdd1fb57dfe 100644 --- a/sound/i2c/tea6330t.c +++ b/sound/i2c/tea6330t.c | |||
@@ -58,7 +58,7 @@ static void snd_tea6330t_set(tea6330t_t *tea, | |||
58 | unsigned char addr, unsigned char value) | 58 | unsigned char addr, unsigned char value) |
59 | { | 59 | { |
60 | #if 0 | 60 | #if 0 |
61 | printk("set - 0x%x/0x%x\n", addr, value); | 61 | printk(KERN_DEBUG "set - 0x%x/0x%x\n", addr, value); |
62 | #endif | 62 | #endif |
63 | snd_i2c_write(tea->bus, TEA6330T_ADDR, addr, value, 1); | 63 | snd_i2c_write(tea->bus, TEA6330T_ADDR, addr, value, 1); |
64 | } | 64 | } |
diff --git a/sound/isa/ad1848/ad1848_lib.c b/sound/isa/ad1848/ad1848_lib.c index 0c2924dfefaf..744b65a35c9c 100644 --- a/sound/isa/ad1848/ad1848_lib.c +++ b/sound/isa/ad1848/ad1848_lib.c | |||
@@ -109,7 +109,7 @@ void snd_ad1848_out(ad1848_t *chip, | |||
109 | udelay(100); | 109 | udelay(100); |
110 | #ifdef CONFIG_SND_DEBUG | 110 | #ifdef CONFIG_SND_DEBUG |
111 | if (inb(AD1848P(chip, REGSEL)) & AD1848_INIT) | 111 | if (inb(AD1848P(chip, REGSEL)) & AD1848_INIT) |
112 | snd_printk("auto calibration time out - reg = 0x%x, value = 0x%x\n", reg, value); | 112 | snd_printk(KERN_WARNING "auto calibration time out - reg = 0x%x, value = 0x%x\n", reg, value); |
113 | #endif | 113 | #endif |
114 | outb(chip->mce_bit | reg, AD1848P(chip, REGSEL)); | 114 | outb(chip->mce_bit | reg, AD1848P(chip, REGSEL)); |
115 | outb(chip->image[reg] = value, AD1848P(chip, REG)); | 115 | outb(chip->image[reg] = value, AD1848P(chip, REG)); |
@@ -139,7 +139,7 @@ static unsigned char snd_ad1848_in(ad1848_t *chip, unsigned char reg) | |||
139 | udelay(100); | 139 | udelay(100); |
140 | #ifdef CONFIG_SND_DEBUG | 140 | #ifdef CONFIG_SND_DEBUG |
141 | if (inb(AD1848P(chip, REGSEL)) & AD1848_INIT) | 141 | if (inb(AD1848P(chip, REGSEL)) & AD1848_INIT) |
142 | snd_printk("auto calibration time out - reg = 0x%x\n", reg); | 142 | snd_printk(KERN_WARNING "auto calibration time out - reg = 0x%x\n", reg); |
143 | #endif | 143 | #endif |
144 | outb(chip->mce_bit | reg, AD1848P(chip, REGSEL)); | 144 | outb(chip->mce_bit | reg, AD1848P(chip, REGSEL)); |
145 | mb(); | 145 | mb(); |
@@ -185,13 +185,13 @@ static void snd_ad1848_mce_up(ad1848_t *chip) | |||
185 | udelay(100); | 185 | udelay(100); |
186 | #ifdef CONFIG_SND_DEBUG | 186 | #ifdef CONFIG_SND_DEBUG |
187 | if (inb(AD1848P(chip, REGSEL)) & AD1848_INIT) | 187 | if (inb(AD1848P(chip, REGSEL)) & AD1848_INIT) |
188 | snd_printk("mce_up - auto calibration time out (0)\n"); | 188 | snd_printk(KERN_WARNING "mce_up - auto calibration time out (0)\n"); |
189 | #endif | 189 | #endif |
190 | spin_lock_irqsave(&chip->reg_lock, flags); | 190 | spin_lock_irqsave(&chip->reg_lock, flags); |
191 | chip->mce_bit |= AD1848_MCE; | 191 | chip->mce_bit |= AD1848_MCE; |
192 | timeout = inb(AD1848P(chip, REGSEL)); | 192 | timeout = inb(AD1848P(chip, REGSEL)); |
193 | if (timeout == 0x80) | 193 | if (timeout == 0x80) |
194 | snd_printk("mce_up [0x%lx]: serious init problem - codec still busy\n", chip->port); | 194 | snd_printk(KERN_WARNING "mce_up [0x%lx]: serious init problem - codec still busy\n", chip->port); |
195 | if (!(timeout & AD1848_MCE)) | 195 | if (!(timeout & AD1848_MCE)) |
196 | outb(chip->mce_bit | (timeout & 0x1f), AD1848P(chip, REGSEL)); | 196 | outb(chip->mce_bit | (timeout & 0x1f), AD1848P(chip, REGSEL)); |
197 | spin_unlock_irqrestore(&chip->reg_lock, flags); | 197 | spin_unlock_irqrestore(&chip->reg_lock, flags); |
@@ -214,13 +214,13 @@ static void snd_ad1848_mce_down(ad1848_t *chip) | |||
214 | #endif | 214 | #endif |
215 | #ifdef CONFIG_SND_DEBUG | 215 | #ifdef CONFIG_SND_DEBUG |
216 | if (inb(AD1848P(chip, REGSEL)) & AD1848_INIT) | 216 | if (inb(AD1848P(chip, REGSEL)) & AD1848_INIT) |
217 | snd_printk("mce_down [0x%lx] - auto calibration time out (0)\n", AD1848P(chip, REGSEL)); | 217 | snd_printk(KERN_WARNING "mce_down [0x%lx] - auto calibration time out (0)\n", AD1848P(chip, REGSEL)); |
218 | #endif | 218 | #endif |
219 | chip->mce_bit &= ~AD1848_MCE; | 219 | chip->mce_bit &= ~AD1848_MCE; |
220 | timeout = inb(AD1848P(chip, REGSEL)); | 220 | timeout = inb(AD1848P(chip, REGSEL)); |
221 | outb(chip->mce_bit | (timeout & 0x1f), AD1848P(chip, REGSEL)); | 221 | outb(chip->mce_bit | (timeout & 0x1f), AD1848P(chip, REGSEL)); |
222 | if (timeout == 0x80) | 222 | if (timeout == 0x80) |
223 | snd_printk("mce_down [0x%lx]: serious init problem - codec still busy\n", chip->port); | 223 | snd_printk(KERN_WARNING "mce_down [0x%lx]: serious init problem - codec still busy\n", chip->port); |
224 | if ((timeout & AD1848_MCE) == 0) { | 224 | if ((timeout & AD1848_MCE) == 0) { |
225 | spin_unlock_irqrestore(&chip->reg_lock, flags); | 225 | spin_unlock_irqrestore(&chip->reg_lock, flags); |
226 | return; | 226 | return; |
@@ -240,7 +240,7 @@ static void snd_ad1848_mce_down(ad1848_t *chip) | |||
240 | while (snd_ad1848_in(chip, AD1848_TEST_INIT) & AD1848_CALIB_IN_PROGRESS) { | 240 | while (snd_ad1848_in(chip, AD1848_TEST_INIT) & AD1848_CALIB_IN_PROGRESS) { |
241 | spin_unlock_irqrestore(&chip->reg_lock, flags); | 241 | spin_unlock_irqrestore(&chip->reg_lock, flags); |
242 | if (time <= 0) { | 242 | if (time <= 0) { |
243 | snd_printk("mce_down - auto calibration time out (2)\n"); | 243 | snd_printk(KERN_ERR "mce_down - auto calibration time out (2)\n"); |
244 | return; | 244 | return; |
245 | } | 245 | } |
246 | set_current_state(TASK_INTERRUPTIBLE); | 246 | set_current_state(TASK_INTERRUPTIBLE); |
@@ -254,7 +254,7 @@ static void snd_ad1848_mce_down(ad1848_t *chip) | |||
254 | while (inb(AD1848P(chip, REGSEL)) & AD1848_INIT) { | 254 | while (inb(AD1848P(chip, REGSEL)) & AD1848_INIT) { |
255 | spin_unlock_irqrestore(&chip->reg_lock, flags); | 255 | spin_unlock_irqrestore(&chip->reg_lock, flags); |
256 | if (time <= 0) { | 256 | if (time <= 0) { |
257 | snd_printk("mce_down - auto calibration time out (3)\n"); | 257 | snd_printk(KERN_ERR "mce_down - auto calibration time out (3)\n"); |
258 | return; | 258 | return; |
259 | } | 259 | } |
260 | set_current_state(TASK_INTERRUPTIBLE); | 260 | set_current_state(TASK_INTERRUPTIBLE); |
diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c index f0f8505cd1a5..970e2aaade27 100644 --- a/sound/isa/es18xx.c +++ b/sound/isa/es18xx.c | |||
@@ -173,7 +173,7 @@ static int snd_es18xx_dsp_command(es18xx_t *chip, unsigned char val) | |||
173 | outb(val, chip->port + 0x0C); | 173 | outb(val, chip->port + 0x0C); |
174 | return 0; | 174 | return 0; |
175 | } | 175 | } |
176 | snd_printk("dsp_command: timeout (0x%x)\n", val); | 176 | snd_printk(KERN_ERR "dsp_command: timeout (0x%x)\n", val); |
177 | return -EINVAL; | 177 | return -EINVAL; |
178 | } | 178 | } |
179 | 179 | ||
@@ -184,7 +184,8 @@ static int snd_es18xx_dsp_get_byte(es18xx_t *chip) | |||
184 | for(i = MILLISECOND/10; i; i--) | 184 | for(i = MILLISECOND/10; i; i--) |
185 | if (inb(chip->port + 0x0C) & 0x40) | 185 | if (inb(chip->port + 0x0C) & 0x40) |
186 | return inb(chip->port + 0x0A); | 186 | return inb(chip->port + 0x0A); |
187 | snd_printk("dsp_get_byte failed: 0x%lx = 0x%x!!!\n", chip->port + 0x0A, inb(chip->port + 0x0A)); | 187 | snd_printk(KERN_ERR "dsp_get_byte failed: 0x%lx = 0x%x!!!\n", |
188 | chip->port + 0x0A, inb(chip->port + 0x0A)); | ||
188 | return -ENODEV; | 189 | return -ENODEV; |
189 | } | 190 | } |
190 | 191 | ||
@@ -204,7 +205,7 @@ static int snd_es18xx_write(es18xx_t *chip, | |||
204 | end: | 205 | end: |
205 | spin_unlock_irqrestore(&chip->reg_lock, flags); | 206 | spin_unlock_irqrestore(&chip->reg_lock, flags); |
206 | #ifdef REG_DEBUG | 207 | #ifdef REG_DEBUG |
207 | snd_printk("Reg %02x set to %02x\n", reg, data); | 208 | snd_printk(KERN_DEBUG "Reg %02x set to %02x\n", reg, data); |
208 | #endif | 209 | #endif |
209 | return ret; | 210 | return ret; |
210 | } | 211 | } |
@@ -223,7 +224,7 @@ static int snd_es18xx_read(es18xx_t *chip, unsigned char reg) | |||
223 | data = snd_es18xx_dsp_get_byte(chip); | 224 | data = snd_es18xx_dsp_get_byte(chip); |
224 | ret = data; | 225 | ret = data; |
225 | #ifdef REG_DEBUG | 226 | #ifdef REG_DEBUG |
226 | snd_printk("Reg %02x now is %02x (%d)\n", reg, data, ret); | 227 | snd_printk(KERN_DEBUG "Reg %02x now is %02x (%d)\n", reg, data, ret); |
227 | #endif | 228 | #endif |
228 | end: | 229 | end: |
229 | spin_unlock_irqrestore(&chip->reg_lock, flags); | 230 | spin_unlock_irqrestore(&chip->reg_lock, flags); |
@@ -259,7 +260,8 @@ static int snd_es18xx_bits(es18xx_t *chip, unsigned char reg, | |||
259 | if (ret < 0) | 260 | if (ret < 0) |
260 | goto end; | 261 | goto end; |
261 | #ifdef REG_DEBUG | 262 | #ifdef REG_DEBUG |
262 | snd_printk("Reg %02x was %02x, set to %02x (%d)\n", reg, old, new, ret); | 263 | snd_printk(KERN_DEBUG "Reg %02x was %02x, set to %02x (%d)\n", |
264 | reg, old, new, ret); | ||
263 | #endif | 265 | #endif |
264 | } | 266 | } |
265 | ret = oval; | 267 | ret = oval; |
@@ -277,7 +279,7 @@ static inline void snd_es18xx_mixer_write(es18xx_t *chip, | |||
277 | outb(data, chip->port + 0x05); | 279 | outb(data, chip->port + 0x05); |
278 | spin_unlock_irqrestore(&chip->mixer_lock, flags); | 280 | spin_unlock_irqrestore(&chip->mixer_lock, flags); |
279 | #ifdef REG_DEBUG | 281 | #ifdef REG_DEBUG |
280 | snd_printk("Mixer reg %02x set to %02x\n", reg, data); | 282 | snd_printk(KERN_DEBUG "Mixer reg %02x set to %02x\n", reg, data); |
281 | #endif | 283 | #endif |
282 | } | 284 | } |
283 | 285 | ||
@@ -290,7 +292,7 @@ static inline int snd_es18xx_mixer_read(es18xx_t *chip, unsigned char reg) | |||
290 | data = inb(chip->port + 0x05); | 292 | data = inb(chip->port + 0x05); |
291 | spin_unlock_irqrestore(&chip->mixer_lock, flags); | 293 | spin_unlock_irqrestore(&chip->mixer_lock, flags); |
292 | #ifdef REG_DEBUG | 294 | #ifdef REG_DEBUG |
293 | snd_printk("Mixer reg %02x now is %02x\n", reg, data); | 295 | snd_printk(KERN_DEBUG "Mixer reg %02x now is %02x\n", reg, data); |
294 | #endif | 296 | #endif |
295 | return data; | 297 | return data; |
296 | } | 298 | } |
@@ -309,7 +311,8 @@ static inline int snd_es18xx_mixer_bits(es18xx_t *chip, unsigned char reg, | |||
309 | new = (old & ~mask) | (val & mask); | 311 | new = (old & ~mask) | (val & mask); |
310 | outb(new, chip->port + 0x05); | 312 | outb(new, chip->port + 0x05); |
311 | #ifdef REG_DEBUG | 313 | #ifdef REG_DEBUG |
312 | snd_printk("Mixer reg %02x was %02x, set to %02x\n", reg, old, new); | 314 | snd_printk(KERN_DEBUG "Mixer reg %02x was %02x, set to %02x\n", |
315 | reg, old, new); | ||
313 | #endif | 316 | #endif |
314 | } | 317 | } |
315 | spin_unlock_irqrestore(&chip->mixer_lock, flags); | 318 | spin_unlock_irqrestore(&chip->mixer_lock, flags); |
@@ -329,7 +332,8 @@ static inline int snd_es18xx_mixer_writable(es18xx_t *chip, unsigned char reg, | |||
329 | new = inb(chip->port + 0x05); | 332 | new = inb(chip->port + 0x05); |
330 | spin_unlock_irqrestore(&chip->mixer_lock, flags); | 333 | spin_unlock_irqrestore(&chip->mixer_lock, flags); |
331 | #ifdef REG_DEBUG | 334 | #ifdef REG_DEBUG |
332 | snd_printk("Mixer reg %02x was %02x, set to %02x, now is %02x\n", reg, old, expected, new); | 335 | snd_printk(KERN_DEBUG "Mixer reg %02x was %02x, set to %02x, now is %02x\n", |
336 | reg, old, expected, new); | ||
333 | #endif | 337 | #endif |
334 | return expected == new; | 338 | return expected == new; |
335 | } | 339 | } |
@@ -1281,7 +1285,7 @@ static void __devinit snd_es18xx_config_write(es18xx_t *chip, | |||
1281 | outb(reg, chip->ctrl_port); | 1285 | outb(reg, chip->ctrl_port); |
1282 | outb(data, chip->ctrl_port + 1); | 1286 | outb(data, chip->ctrl_port + 1); |
1283 | #ifdef REG_DEBUG | 1287 | #ifdef REG_DEBUG |
1284 | snd_printk("Config reg %02x set to %02x\n", reg, data); | 1288 | snd_printk(KERN_DEBUG "Config reg %02x set to %02x\n", reg, data); |
1285 | #endif | 1289 | #endif |
1286 | } | 1290 | } |
1287 | 1291 | ||
@@ -1346,7 +1350,7 @@ static int __devinit snd_es18xx_initialize(es18xx_t *chip) | |||
1346 | irqmask = 3; | 1350 | irqmask = 3; |
1347 | break; | 1351 | break; |
1348 | default: | 1352 | default: |
1349 | snd_printk("invalid irq %d\n", chip->irq); | 1353 | snd_printk(KERN_ERR "invalid irq %d\n", chip->irq); |
1350 | return -ENODEV; | 1354 | return -ENODEV; |
1351 | } | 1355 | } |
1352 | switch (chip->dma1) { | 1356 | switch (chip->dma1) { |
@@ -1360,7 +1364,7 @@ static int __devinit snd_es18xx_initialize(es18xx_t *chip) | |||
1360 | dma1mask = 3; | 1364 | dma1mask = 3; |
1361 | break; | 1365 | break; |
1362 | default: | 1366 | default: |
1363 | snd_printk("invalid dma1 %d\n", chip->dma1); | 1367 | snd_printk(KERN_ERR "invalid dma1 %d\n", chip->dma1); |
1364 | return -ENODEV; | 1368 | return -ENODEV; |
1365 | } | 1369 | } |
1366 | switch (chip->dma2) { | 1370 | switch (chip->dma2) { |
@@ -1377,7 +1381,7 @@ static int __devinit snd_es18xx_initialize(es18xx_t *chip) | |||
1377 | dma2mask = 3; | 1381 | dma2mask = 3; |
1378 | break; | 1382 | break; |
1379 | default: | 1383 | default: |
1380 | snd_printk("invalid dma2 %d\n", chip->dma2); | 1384 | snd_printk(KERN_ERR "invalid dma2 %d\n", chip->dma2); |
1381 | return -ENODEV; | 1385 | return -ENODEV; |
1382 | } | 1386 | } |
1383 | 1387 | ||
@@ -1440,7 +1444,7 @@ static int __devinit snd_es18xx_identify(es18xx_t *chip) | |||
1440 | 1444 | ||
1441 | /* reset */ | 1445 | /* reset */ |
1442 | if (snd_es18xx_reset(chip) < 0) { | 1446 | if (snd_es18xx_reset(chip) < 0) { |
1443 | snd_printk("reset at 0x%lx failed!!!\n", chip->port); | 1447 | snd_printk(KERN_ERR "reset at 0x%lx failed!!!\n", chip->port); |
1444 | return -ENODEV; | 1448 | return -ENODEV; |
1445 | } | 1449 | } |
1446 | 1450 | ||
@@ -1527,7 +1531,7 @@ static int __devinit snd_es18xx_probe(es18xx_t *chip) | |||
1527 | chip->caps = ES18XX_PCM2 | ES18XX_RECMIX | ES18XX_AUXB | ES18XX_DUPLEX_SAME | ES18XX_HWV; | 1531 | chip->caps = ES18XX_PCM2 | ES18XX_RECMIX | ES18XX_AUXB | ES18XX_DUPLEX_SAME | ES18XX_HWV; |
1528 | break; | 1532 | break; |
1529 | default: | 1533 | default: |
1530 | snd_printk("[0x%lx] unsupported chip ES%x\n", | 1534 | snd_printk(KERN_ERR "[0x%lx] unsupported chip ES%x\n", |
1531 | chip->port, chip->version); | 1535 | chip->port, chip->version); |
1532 | return -ENODEV; | 1536 | return -ENODEV; |
1533 | } | 1537 | } |
diff --git a/sound/isa/gus/gus_dma.c b/sound/isa/gus/gus_dma.c index de4b56d80b35..ef1b2e9832e4 100644 --- a/sound/isa/gus/gus_dma.c +++ b/sound/isa/gus/gus_dma.c | |||
@@ -199,7 +199,7 @@ int snd_gf1_dma_transfer_block(snd_gus_card_t * gus, | |||
199 | 199 | ||
200 | block = kmalloc(sizeof(*block), atomic ? GFP_ATOMIC : GFP_KERNEL); | 200 | block = kmalloc(sizeof(*block), atomic ? GFP_ATOMIC : GFP_KERNEL); |
201 | if (block == NULL) { | 201 | if (block == NULL) { |
202 | snd_printk("gf1: DMA transfer failure; not enough memory\n"); | 202 | snd_printk(KERN_ERR "gf1: DMA transfer failure; not enough memory\n"); |
203 | return -ENOMEM; | 203 | return -ENOMEM; |
204 | } | 204 | } |
205 | *block = *__block; | 205 | *block = *__block; |
diff --git a/sound/isa/gus/gus_io.c b/sound/isa/gus/gus_io.c index 23e1b5f19e1a..8d5752b23787 100644 --- a/sound/isa/gus/gus_io.c +++ b/sound/isa/gus/gus_io.c | |||
@@ -343,7 +343,7 @@ void snd_gf1_pokew(snd_gus_card_t * gus, unsigned int addr, unsigned short data) | |||
343 | 343 | ||
344 | #ifdef CONFIG_SND_DEBUG | 344 | #ifdef CONFIG_SND_DEBUG |
345 | if (!gus->interwave) | 345 | if (!gus->interwave) |
346 | snd_printk("snd_gf1_pokew - GF1!!!\n"); | 346 | snd_printk(KERN_DEBUG "snd_gf1_pokew - GF1!!!\n"); |
347 | #endif | 347 | #endif |
348 | spin_lock_irqsave(&gus->reg_lock, flags); | 348 | spin_lock_irqsave(&gus->reg_lock, flags); |
349 | outb(SNDRV_GF1_GW_DRAM_IO_LOW, gus->gf1.reg_regsel); | 349 | outb(SNDRV_GF1_GW_DRAM_IO_LOW, gus->gf1.reg_regsel); |
@@ -367,7 +367,7 @@ unsigned short snd_gf1_peekw(snd_gus_card_t * gus, unsigned int addr) | |||
367 | 367 | ||
368 | #ifdef CONFIG_SND_DEBUG | 368 | #ifdef CONFIG_SND_DEBUG |
369 | if (!gus->interwave) | 369 | if (!gus->interwave) |
370 | snd_printk("snd_gf1_peekw - GF1!!!\n"); | 370 | snd_printk(KERN_DEBUG "snd_gf1_peekw - GF1!!!\n"); |
371 | #endif | 371 | #endif |
372 | spin_lock_irqsave(&gus->reg_lock, flags); | 372 | spin_lock_irqsave(&gus->reg_lock, flags); |
373 | outb(SNDRV_GF1_GW_DRAM_IO_LOW, gus->gf1.reg_regsel); | 373 | outb(SNDRV_GF1_GW_DRAM_IO_LOW, gus->gf1.reg_regsel); |
@@ -393,7 +393,7 @@ void snd_gf1_dram_setmem(snd_gus_card_t * gus, unsigned int addr, | |||
393 | 393 | ||
394 | #ifdef CONFIG_SND_DEBUG | 394 | #ifdef CONFIG_SND_DEBUG |
395 | if (!gus->interwave) | 395 | if (!gus->interwave) |
396 | snd_printk("snd_gf1_dram_setmem - GF1!!!\n"); | 396 | snd_printk(KERN_DEBUG "snd_gf1_dram_setmem - GF1!!!\n"); |
397 | #endif | 397 | #endif |
398 | addr &= ~1; | 398 | addr &= ~1; |
399 | count >>= 1; | 399 | count >>= 1; |
@@ -449,30 +449,30 @@ void snd_gf1_print_voice_registers(snd_gus_card_t * gus) | |||
449 | int voice, ctrl; | 449 | int voice, ctrl; |
450 | 450 | ||
451 | voice = gus->gf1.active_voice; | 451 | voice = gus->gf1.active_voice; |
452 | printk(" -%i- GF1 voice ctrl, ramp ctrl = 0x%x, 0x%x\n", voice, ctrl = snd_gf1_i_read8(gus, 0), snd_gf1_i_read8(gus, 0x0d)); | 452 | printk(KERN_INFO " -%i- GF1 voice ctrl, ramp ctrl = 0x%x, 0x%x\n", voice, ctrl = snd_gf1_i_read8(gus, 0), snd_gf1_i_read8(gus, 0x0d)); |
453 | printk(" -%i- GF1 frequency = 0x%x\n", voice, snd_gf1_i_read16(gus, 1)); | 453 | printk(KERN_INFO " -%i- GF1 frequency = 0x%x\n", voice, snd_gf1_i_read16(gus, 1)); |
454 | printk(" -%i- GF1 loop start, end = 0x%x (0x%x), 0x%x (0x%x)\n", voice, snd_gf1_i_read_addr(gus, 2, ctrl & 4), snd_gf1_i_read_addr(gus, 2, (ctrl & 4) ^ 4), snd_gf1_i_read_addr(gus, 4, ctrl & 4), snd_gf1_i_read_addr(gus, 4, (ctrl & 4) ^ 4)); | 454 | printk(KERN_INFO " -%i- GF1 loop start, end = 0x%x (0x%x), 0x%x (0x%x)\n", voice, snd_gf1_i_read_addr(gus, 2, ctrl & 4), snd_gf1_i_read_addr(gus, 2, (ctrl & 4) ^ 4), snd_gf1_i_read_addr(gus, 4, ctrl & 4), snd_gf1_i_read_addr(gus, 4, (ctrl & 4) ^ 4)); |
455 | printk(" -%i- GF1 ramp start, end, rate = 0x%x, 0x%x, 0x%x\n", voice, snd_gf1_i_read8(gus, 7), snd_gf1_i_read8(gus, 8), snd_gf1_i_read8(gus, 6)); | 455 | printk(KERN_INFO " -%i- GF1 ramp start, end, rate = 0x%x, 0x%x, 0x%x\n", voice, snd_gf1_i_read8(gus, 7), snd_gf1_i_read8(gus, 8), snd_gf1_i_read8(gus, 6)); |
456 | printk(" -%i- GF1 volume = 0x%x\n", voice, snd_gf1_i_read16(gus, 9)); | 456 | printk(KERN_INFO" -%i- GF1 volume = 0x%x\n", voice, snd_gf1_i_read16(gus, 9)); |
457 | printk(" -%i- GF1 position = 0x%x (0x%x)\n", voice, snd_gf1_i_read_addr(gus, 0x0a, ctrl & 4), snd_gf1_i_read_addr(gus, 0x0a, (ctrl & 4) ^ 4)); | 457 | printk(KERN_INFO " -%i- GF1 position = 0x%x (0x%x)\n", voice, snd_gf1_i_read_addr(gus, 0x0a, ctrl & 4), snd_gf1_i_read_addr(gus, 0x0a, (ctrl & 4) ^ 4)); |
458 | if (gus->interwave && snd_gf1_i_read8(gus, 0x19) & 0x01) { /* enhanced mode */ | 458 | if (gus->interwave && snd_gf1_i_read8(gus, 0x19) & 0x01) { /* enhanced mode */ |
459 | mode = snd_gf1_i_read8(gus, 0x15); | 459 | mode = snd_gf1_i_read8(gus, 0x15); |
460 | printk(" -%i- GFA1 mode = 0x%x\n", voice, mode); | 460 | printk(KERN_INFO " -%i- GFA1 mode = 0x%x\n", voice, mode); |
461 | if (mode & 0x01) { /* Effect processor */ | 461 | if (mode & 0x01) { /* Effect processor */ |
462 | printk(" -%i- GFA1 effect address = 0x%x\n", voice, snd_gf1_i_read_addr(gus, 0x11, ctrl & 4)); | 462 | printk(KERN_INFO " -%i- GFA1 effect address = 0x%x\n", voice, snd_gf1_i_read_addr(gus, 0x11, ctrl & 4)); |
463 | printk(" -%i- GFA1 effect volume = 0x%x\n", voice, snd_gf1_i_read16(gus, 0x16)); | 463 | printk(KERN_INFO " -%i- GFA1 effect volume = 0x%x\n", voice, snd_gf1_i_read16(gus, 0x16)); |
464 | printk(" -%i- GFA1 effect volume final = 0x%x\n", voice, snd_gf1_i_read16(gus, 0x1d)); | 464 | printk(KERN_INFO " -%i- GFA1 effect volume final = 0x%x\n", voice, snd_gf1_i_read16(gus, 0x1d)); |
465 | printk(" -%i- GFA1 effect acumulator = 0x%x\n", voice, snd_gf1_i_read8(gus, 0x14)); | 465 | printk(KERN_INFO " -%i- GFA1 effect acumulator = 0x%x\n", voice, snd_gf1_i_read8(gus, 0x14)); |
466 | } | 466 | } |
467 | if (mode & 0x20) { | 467 | if (mode & 0x20) { |
468 | printk(" -%i- GFA1 left offset = 0x%x (%i)\n", voice, snd_gf1_i_read16(gus, 0x13), snd_gf1_i_read16(gus, 0x13) >> 4); | 468 | printk(KERN_INFO " -%i- GFA1 left offset = 0x%x (%i)\n", voice, snd_gf1_i_read16(gus, 0x13), snd_gf1_i_read16(gus, 0x13) >> 4); |
469 | printk(" -%i- GFA1 left offset final = 0x%x (%i)\n", voice, snd_gf1_i_read16(gus, 0x1c), snd_gf1_i_read16(gus, 0x1c) >> 4); | 469 | printk(KERN_INFO " -%i- GFA1 left offset final = 0x%x (%i)\n", voice, snd_gf1_i_read16(gus, 0x1c), snd_gf1_i_read16(gus, 0x1c) >> 4); |
470 | printk(" -%i- GFA1 right offset = 0x%x (%i)\n", voice, snd_gf1_i_read16(gus, 0x0c), snd_gf1_i_read16(gus, 0x0c) >> 4); | 470 | printk(KERN_INFO " -%i- GFA1 right offset = 0x%x (%i)\n", voice, snd_gf1_i_read16(gus, 0x0c), snd_gf1_i_read16(gus, 0x0c) >> 4); |
471 | printk(" -%i- GFA1 right offset final = 0x%x (%i)\n", voice, snd_gf1_i_read16(gus, 0x1b), snd_gf1_i_read16(gus, 0x1b) >> 4); | 471 | printk(KERN_INFO " -%i- GFA1 right offset final = 0x%x (%i)\n", voice, snd_gf1_i_read16(gus, 0x1b), snd_gf1_i_read16(gus, 0x1b) >> 4); |
472 | } else | 472 | } else |
473 | printk(" -%i- GF1 pan = 0x%x\n", voice, snd_gf1_i_read8(gus, 0x0c)); | 473 | printk(KERN_INFO " -%i- GF1 pan = 0x%x\n", voice, snd_gf1_i_read8(gus, 0x0c)); |
474 | } else | 474 | } else |
475 | printk(" -%i- GF1 pan = 0x%x\n", voice, snd_gf1_i_read8(gus, 0x0c)); | 475 | printk(KERN_INFO " -%i- GF1 pan = 0x%x\n", voice, snd_gf1_i_read8(gus, 0x0c)); |
476 | } | 476 | } |
477 | 477 | ||
478 | #if 0 | 478 | #if 0 |
@@ -481,45 +481,45 @@ void snd_gf1_print_global_registers(snd_gus_card_t * gus) | |||
481 | { | 481 | { |
482 | unsigned char global_mode = 0x00; | 482 | unsigned char global_mode = 0x00; |
483 | 483 | ||
484 | printk(" -G- GF1 active voices = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_ACTIVE_VOICES)); | 484 | printk(KERN_INFO " -G- GF1 active voices = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_ACTIVE_VOICES)); |
485 | if (gus->interwave) { | 485 | if (gus->interwave) { |
486 | global_mode = snd_gf1_i_read8(gus, SNDRV_GF1_GB_GLOBAL_MODE); | 486 | global_mode = snd_gf1_i_read8(gus, SNDRV_GF1_GB_GLOBAL_MODE); |
487 | printk(" -G- GF1 global mode = 0x%x\n", global_mode); | 487 | printk(KERN_INFO " -G- GF1 global mode = 0x%x\n", global_mode); |
488 | } | 488 | } |
489 | if (global_mode & 0x02) /* LFO enabled? */ | 489 | if (global_mode & 0x02) /* LFO enabled? */ |
490 | printk(" -G- GF1 LFO base = 0x%x\n", snd_gf1_i_look16(gus, SNDRV_GF1_GW_LFO_BASE)); | 490 | printk(KERN_INFO " -G- GF1 LFO base = 0x%x\n", snd_gf1_i_look16(gus, SNDRV_GF1_GW_LFO_BASE)); |
491 | printk(" -G- GF1 voices IRQ read = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_VOICES_IRQ_READ)); | 491 | printk(KERN_INFO " -G- GF1 voices IRQ read = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_VOICES_IRQ_READ)); |
492 | printk(" -G- GF1 DRAM DMA control = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_DRAM_DMA_CONTROL)); | 492 | printk(KERN_INFO " -G- GF1 DRAM DMA control = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_DRAM_DMA_CONTROL)); |
493 | printk(" -G- GF1 DRAM DMA high/low = 0x%x/0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_DRAM_DMA_HIGH), snd_gf1_i_read16(gus, SNDRV_GF1_GW_DRAM_DMA_LOW)); | 493 | printk(KERN_INFO " -G- GF1 DRAM DMA high/low = 0x%x/0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_DRAM_DMA_HIGH), snd_gf1_i_read16(gus, SNDRV_GF1_GW_DRAM_DMA_LOW)); |
494 | printk(" -G- GF1 DRAM IO high/low = 0x%x/0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_DRAM_IO_HIGH), snd_gf1_i_read16(gus, SNDRV_GF1_GW_DRAM_IO_LOW)); | 494 | printk(KERN_INFO " -G- GF1 DRAM IO high/low = 0x%x/0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_DRAM_IO_HIGH), snd_gf1_i_read16(gus, SNDRV_GF1_GW_DRAM_IO_LOW)); |
495 | if (!gus->interwave) | 495 | if (!gus->interwave) |
496 | printk(" -G- GF1 record DMA control = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_REC_DMA_CONTROL)); | 496 | printk(KERN_INFO " -G- GF1 record DMA control = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_REC_DMA_CONTROL)); |
497 | printk(" -G- GF1 DRAM IO 16 = 0x%x\n", snd_gf1_i_look16(gus, SNDRV_GF1_GW_DRAM_IO16)); | 497 | printk(KERN_INFO " -G- GF1 DRAM IO 16 = 0x%x\n", snd_gf1_i_look16(gus, SNDRV_GF1_GW_DRAM_IO16)); |
498 | if (gus->gf1.enh_mode) { | 498 | if (gus->gf1.enh_mode) { |
499 | printk(" -G- GFA1 memory config = 0x%x\n", snd_gf1_i_look16(gus, SNDRV_GF1_GW_MEMORY_CONFIG)); | 499 | printk(KERN_INFO " -G- GFA1 memory config = 0x%x\n", snd_gf1_i_look16(gus, SNDRV_GF1_GW_MEMORY_CONFIG)); |
500 | printk(" -G- GFA1 memory control = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_MEMORY_CONTROL)); | 500 | printk(KERN_INFO " -G- GFA1 memory control = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_MEMORY_CONTROL)); |
501 | printk(" -G- GFA1 FIFO record base = 0x%x\n", snd_gf1_i_look16(gus, SNDRV_GF1_GW_FIFO_RECORD_BASE_ADDR)); | 501 | printk(KERN_INFO " -G- GFA1 FIFO record base = 0x%x\n", snd_gf1_i_look16(gus, SNDRV_GF1_GW_FIFO_RECORD_BASE_ADDR)); |
502 | printk(" -G- GFA1 FIFO playback base = 0x%x\n", snd_gf1_i_look16(gus, SNDRV_GF1_GW_FIFO_PLAY_BASE_ADDR)); | 502 | printk(KERN_INFO " -G- GFA1 FIFO playback base = 0x%x\n", snd_gf1_i_look16(gus, SNDRV_GF1_GW_FIFO_PLAY_BASE_ADDR)); |
503 | printk(" -G- GFA1 interleave control = 0x%x\n", snd_gf1_i_look16(gus, SNDRV_GF1_GW_INTERLEAVE)); | 503 | printk(KERN_INFO " -G- GFA1 interleave control = 0x%x\n", snd_gf1_i_look16(gus, SNDRV_GF1_GW_INTERLEAVE)); |
504 | } | 504 | } |
505 | } | 505 | } |
506 | 506 | ||
507 | void snd_gf1_print_setup_registers(snd_gus_card_t * gus) | 507 | void snd_gf1_print_setup_registers(snd_gus_card_t * gus) |
508 | { | 508 | { |
509 | printk(" -S- mix control = 0x%x\n", inb(GUSP(gus, MIXCNTRLREG))); | 509 | printk(KERN_INFO " -S- mix control = 0x%x\n", inb(GUSP(gus, MIXCNTRLREG))); |
510 | printk(" -S- IRQ status = 0x%x\n", inb(GUSP(gus, IRQSTAT))); | 510 | printk(KERN_INFO " -S- IRQ status = 0x%x\n", inb(GUSP(gus, IRQSTAT))); |
511 | printk(" -S- timer control = 0x%x\n", inb(GUSP(gus, TIMERCNTRL))); | 511 | printk(KERN_INFO " -S- timer control = 0x%x\n", inb(GUSP(gus, TIMERCNTRL))); |
512 | printk(" -S- timer data = 0x%x\n", inb(GUSP(gus, TIMERDATA))); | 512 | printk(KERN_INFO " -S- timer data = 0x%x\n", inb(GUSP(gus, TIMERDATA))); |
513 | printk(" -S- status read = 0x%x\n", inb(GUSP(gus, REGCNTRLS))); | 513 | printk(KERN_INFO " -S- status read = 0x%x\n", inb(GUSP(gus, REGCNTRLS))); |
514 | printk(" -S- Sound Blaster control = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_SOUND_BLASTER_CONTROL)); | 514 | printk(KERN_INFO " -S- Sound Blaster control = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_SOUND_BLASTER_CONTROL)); |
515 | printk(" -S- AdLib timer 1/2 = 0x%x/0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_ADLIB_TIMER_1), snd_gf1_i_look8(gus, SNDRV_GF1_GB_ADLIB_TIMER_2)); | 515 | printk(KERN_INFO " -S- AdLib timer 1/2 = 0x%x/0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_ADLIB_TIMER_1), snd_gf1_i_look8(gus, SNDRV_GF1_GB_ADLIB_TIMER_2)); |
516 | printk(" -S- reset = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_RESET)); | 516 | printk(KERN_INFO " -S- reset = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_RESET)); |
517 | if (gus->interwave) { | 517 | if (gus->interwave) { |
518 | printk(" -S- compatibility = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_COMPATIBILITY)); | 518 | printk(KERN_INFO " -S- compatibility = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_COMPATIBILITY)); |
519 | printk(" -S- decode control = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_DECODE_CONTROL)); | 519 | printk(KERN_INFO " -S- decode control = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_DECODE_CONTROL)); |
520 | printk(" -S- version number = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_VERSION_NUMBER)); | 520 | printk(KERN_INFO " -S- version number = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_VERSION_NUMBER)); |
521 | printk(" -S- MPU-401 emul. control A/B = 0x%x/0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_MPU401_CONTROL_A), snd_gf1_i_look8(gus, SNDRV_GF1_GB_MPU401_CONTROL_B)); | 521 | printk(KERN_INFO " -S- MPU-401 emul. control A/B = 0x%x/0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_MPU401_CONTROL_A), snd_gf1_i_look8(gus, SNDRV_GF1_GB_MPU401_CONTROL_B)); |
522 | printk(" -S- emulation IRQ = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_EMULATION_IRQ)); | 522 | printk(KERN_INFO " -S- emulation IRQ = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_EMULATION_IRQ)); |
523 | } | 523 | } |
524 | } | 524 | } |
525 | 525 | ||
diff --git a/sound/isa/gus/gus_main.c b/sound/isa/gus/gus_main.c index 5fd374f052ec..4f57ff4ab351 100644 --- a/sound/isa/gus/gus_main.c +++ b/sound/isa/gus/gus_main.c | |||
@@ -246,7 +246,7 @@ static int snd_gus_detect_memory(snd_gus_card_t * gus) | |||
246 | snd_gf1_poke(gus, 0L, 0xaa); | 246 | snd_gf1_poke(gus, 0L, 0xaa); |
247 | snd_gf1_poke(gus, 1L, 0x55); | 247 | snd_gf1_poke(gus, 1L, 0x55); |
248 | if (snd_gf1_peek(gus, 0L) != 0xaa || snd_gf1_peek(gus, 1L) != 0x55) { | 248 | if (snd_gf1_peek(gus, 0L) != 0xaa || snd_gf1_peek(gus, 1L) != 0x55) { |
249 | snd_printk("plain GF1 card at 0x%lx without onboard DRAM?\n", gus->gf1.port); | 249 | snd_printk(KERN_ERR "plain GF1 card at 0x%lx without onboard DRAM?\n", gus->gf1.port); |
250 | return -ENOMEM; | 250 | return -ENOMEM; |
251 | } | 251 | } |
252 | for (idx = 1, d = 0xab; idx < 4; idx++, d++) { | 252 | for (idx = 1, d = 0xab; idx < 4; idx++, d++) { |
@@ -299,20 +299,17 @@ static int snd_gus_init_dma_irq(snd_gus_card_t * gus, int latches) | |||
299 | dma2 = gus->gf1.dma2; | 299 | dma2 = gus->gf1.dma2; |
300 | dma2 = dma2 < 0 ? -dma2 : dma2; | 300 | dma2 = dma2 < 0 ? -dma2 : dma2; |
301 | dma2 = dmas[dma2 & 7]; | 301 | dma2 = dmas[dma2 & 7]; |
302 | #if 0 | ||
303 | printk("dma1 = %i, dma2 = %i\n", gus->gf1.dma1, gus->gf1.dma2); | ||
304 | #endif | ||
305 | dma1 |= gus->equal_dma ? 0x40 : (dma2 << 3); | 302 | dma1 |= gus->equal_dma ? 0x40 : (dma2 << 3); |
306 | 303 | ||
307 | if ((dma1 & 7) == 0 || (dma2 & 7) == 0) { | 304 | if ((dma1 & 7) == 0 || (dma2 & 7) == 0) { |
308 | snd_printk("Error! DMA isn't defined.\n"); | 305 | snd_printk(KERN_ERR "Error! DMA isn't defined.\n"); |
309 | return -EINVAL; | 306 | return -EINVAL; |
310 | } | 307 | } |
311 | irq = gus->gf1.irq; | 308 | irq = gus->gf1.irq; |
312 | irq = irq < 0 ? -irq : irq; | 309 | irq = irq < 0 ? -irq : irq; |
313 | irq = irqs[irq & 0x0f]; | 310 | irq = irqs[irq & 0x0f]; |
314 | if (irq == 0) { | 311 | if (irq == 0) { |
315 | snd_printk("Error! IRQ isn't defined.\n"); | 312 | snd_printk(KERN_ERR "Error! IRQ isn't defined.\n"); |
316 | return -EINVAL; | 313 | return -EINVAL; |
317 | } | 314 | } |
318 | irq |= 0x40; | 315 | irq |= 0x40; |
@@ -400,8 +397,8 @@ static int snd_gus_check_version(snd_gus_card_t * gus) | |||
400 | strcpy(card->longname, "Gravis UltraSound Extreme"); | 397 | strcpy(card->longname, "Gravis UltraSound Extreme"); |
401 | gus->ess_flag = 1; | 398 | gus->ess_flag = 1; |
402 | } else { | 399 | } else { |
403 | snd_printk("unknown GF1 revision number at 0x%lx - 0x%x (0x%x)\n", gus->gf1.port, rev, val); | 400 | snd_printk(KERN_ERR "unknown GF1 revision number at 0x%lx - 0x%x (0x%x)\n", gus->gf1.port, rev, val); |
404 | snd_printk(" please - report to <perex@suse.cz>\n"); | 401 | snd_printk(KERN_ERR " please - report to <perex@suse.cz>\n"); |
405 | } | 402 | } |
406 | } | 403 | } |
407 | } | 404 | } |
@@ -425,7 +422,7 @@ int snd_gus_initialize(snd_gus_card_t *gus) | |||
425 | 422 | ||
426 | if (!gus->interwave) { | 423 | if (!gus->interwave) { |
427 | if ((err = snd_gus_check_version(gus)) < 0) { | 424 | if ((err = snd_gus_check_version(gus)) < 0) { |
428 | snd_printk("version check failed\n"); | 425 | snd_printk(KERN_ERR "version check failed\n"); |
429 | return err; | 426 | return err; |
430 | } | 427 | } |
431 | if ((err = snd_gus_detect_memory(gus)) < 0) | 428 | if ((err = snd_gus_detect_memory(gus)) < 0) |
diff --git a/sound/isa/gus/gus_mem.c b/sound/isa/gus/gus_mem.c index 5eb766dd564b..2e23f2a8c627 100644 --- a/sound/isa/gus/gus_mem.c +++ b/sound/isa/gus/gus_mem.c | |||
@@ -198,7 +198,7 @@ snd_gf1_mem_block_t *snd_gf1_mem_alloc(snd_gf1_mem_t * alloc, int owner, | |||
198 | if (nblock != NULL) { | 198 | if (nblock != NULL) { |
199 | if (size != (int)nblock->size) { | 199 | if (size != (int)nblock->size) { |
200 | /* TODO: remove in the future */ | 200 | /* TODO: remove in the future */ |
201 | snd_printk("snd_gf1_mem_alloc - share: sizes differ\n"); | 201 | snd_printk(KERN_ERR "snd_gf1_mem_alloc - share: sizes differ\n"); |
202 | goto __std; | 202 | goto __std; |
203 | } | 203 | } |
204 | nblock->share++; | 204 | nblock->share++; |
diff --git a/sound/isa/gus/gus_pcm.c b/sound/isa/gus/gus_pcm.c index beb01365dc46..720c0739c3a5 100644 --- a/sound/isa/gus/gus_pcm.c +++ b/sound/isa/gus/gus_pcm.c | |||
@@ -698,7 +698,7 @@ static int snd_gf1_pcm_playback_close(snd_pcm_substream_t * substream) | |||
698 | gus_pcm_private_t *pcmp = runtime->private_data; | 698 | gus_pcm_private_t *pcmp = runtime->private_data; |
699 | 699 | ||
700 | if (!wait_event_timeout(pcmp->sleep, (atomic_read(&pcmp->dma_count) <= 0), 2*HZ)) | 700 | if (!wait_event_timeout(pcmp->sleep, (atomic_read(&pcmp->dma_count) <= 0), 2*HZ)) |
701 | snd_printk("gf1 pcm - serious DMA problem\n"); | 701 | snd_printk(KERN_ERR "gf1 pcm - serious DMA problem\n"); |
702 | 702 | ||
703 | snd_gf1_dma_done(gus); | 703 | snd_gf1_dma_done(gus); |
704 | return 0; | 704 | return 0; |
diff --git a/sound/isa/gus/gus_reset.c b/sound/isa/gus/gus_reset.c index ef687abc7070..90710969ef7f 100644 --- a/sound/isa/gus/gus_reset.c +++ b/sound/isa/gus/gus_reset.c | |||
@@ -134,7 +134,7 @@ void snd_gf1_smart_stop_voice(snd_gus_card_t * gus, unsigned short voice) | |||
134 | spin_lock_irqsave(&gus->reg_lock, flags); | 134 | spin_lock_irqsave(&gus->reg_lock, flags); |
135 | snd_gf1_select_voice(gus, voice); | 135 | snd_gf1_select_voice(gus, voice); |
136 | #if 0 | 136 | #if 0 |
137 | printk(" -%i- smart stop voice - volume = 0x%x\n", voice, snd_gf1_i_read16(gus, SNDRV_GF1_VW_VOLUME)); | 137 | printk(KERN_DEBUG " -%i- smart stop voice - volume = 0x%x\n", voice, snd_gf1_i_read16(gus, SNDRV_GF1_VW_VOLUME)); |
138 | #endif | 138 | #endif |
139 | snd_gf1_ctrl_stop(gus, SNDRV_GF1_VB_ADDRESS_CONTROL); | 139 | snd_gf1_ctrl_stop(gus, SNDRV_GF1_VB_ADDRESS_CONTROL); |
140 | snd_gf1_ctrl_stop(gus, SNDRV_GF1_VB_VOLUME_CONTROL); | 140 | snd_gf1_ctrl_stop(gus, SNDRV_GF1_VB_VOLUME_CONTROL); |
@@ -148,7 +148,7 @@ void snd_gf1_stop_voice(snd_gus_card_t * gus, unsigned short voice) | |||
148 | spin_lock_irqsave(&gus->reg_lock, flags); | 148 | spin_lock_irqsave(&gus->reg_lock, flags); |
149 | snd_gf1_select_voice(gus, voice); | 149 | snd_gf1_select_voice(gus, voice); |
150 | #if 0 | 150 | #if 0 |
151 | printk(" -%i- stop voice - volume = 0x%x\n", voice, snd_gf1_i_read16(gus, SNDRV_GF1_VW_VOLUME)); | 151 | printk(KERN_DEBUG " -%i- stop voice - volume = 0x%x\n", voice, snd_gf1_i_read16(gus, SNDRV_GF1_VW_VOLUME)); |
152 | #endif | 152 | #endif |
153 | snd_gf1_ctrl_stop(gus, SNDRV_GF1_VB_ADDRESS_CONTROL); | 153 | snd_gf1_ctrl_stop(gus, SNDRV_GF1_VB_ADDRESS_CONTROL); |
154 | snd_gf1_ctrl_stop(gus, SNDRV_GF1_VB_VOLUME_CONTROL); | 154 | snd_gf1_ctrl_stop(gus, SNDRV_GF1_VB_VOLUME_CONTROL); |
diff --git a/sound/isa/gus/gus_simple.c b/sound/isa/gus/gus_simple.c index c122e7be6ceb..dfed85b58b3a 100644 --- a/sound/isa/gus/gus_simple.c +++ b/sound/isa/gus/gus_simple.c | |||
@@ -136,7 +136,7 @@ static void do_volume_envelope(snd_gus_card_t *gus, snd_gus_voice_t *voice) | |||
136 | snd_gf1_select_voice(gus, voice->number); | 136 | snd_gf1_select_voice(gus, voice->number); |
137 | snd_gf1_ctrl_stop(gus, SNDRV_GF1_VB_VOLUME_CONTROL); | 137 | snd_gf1_ctrl_stop(gus, SNDRV_GF1_VB_VOLUME_CONTROL); |
138 | snd_gf1_write16(gus, SNDRV_GF1_VW_VOLUME, voice->gf1_volume); | 138 | snd_gf1_write16(gus, SNDRV_GF1_VW_VOLUME, voice->gf1_volume); |
139 | printk("gf1_volume = 0x%x\n", voice->gf1_volume); | 139 | /* printk("gf1_volume = 0x%x\n", voice->gf1_volume); */ |
140 | spin_unlock_irqrestore(&gus->reg_lock, flags); | 140 | spin_unlock_irqrestore(&gus->reg_lock, flags); |
141 | return; | 141 | return; |
142 | } | 142 | } |
diff --git a/sound/isa/gus/gus_uart.c b/sound/isa/gus/gus_uart.c index 1bc2da8784e0..fbc95e99105c 100644 --- a/sound/isa/gus/gus_uart.c +++ b/sound/isa/gus/gus_uart.c | |||
@@ -104,7 +104,7 @@ static int snd_gf1_uart_output_open(snd_rawmidi_substream_t * substream) | |||
104 | gus->midi_substream_output = substream; | 104 | gus->midi_substream_output = substream; |
105 | spin_unlock_irqrestore(&gus->uart_cmd_lock, flags); | 105 | spin_unlock_irqrestore(&gus->uart_cmd_lock, flags); |
106 | #if 0 | 106 | #if 0 |
107 | snd_printk("write init - cmd = 0x%x, stat = 0x%x\n", gus->gf1.uart_cmd, snd_gf1_uart_stat(gus)); | 107 | snd_printk(KERN_DEBUG "write init - cmd = 0x%x, stat = 0x%x\n", gus->gf1.uart_cmd, snd_gf1_uart_stat(gus)); |
108 | #endif | 108 | #endif |
109 | return 0; | 109 | return 0; |
110 | } | 110 | } |
@@ -126,7 +126,7 @@ static int snd_gf1_uart_input_open(snd_rawmidi_substream_t * substream) | |||
126 | for (i = 0; i < 1000 && (snd_gf1_uart_stat(gus) & 0x01); i++) | 126 | for (i = 0; i < 1000 && (snd_gf1_uart_stat(gus) & 0x01); i++) |
127 | snd_gf1_uart_get(gus); /* clean Rx */ | 127 | snd_gf1_uart_get(gus); /* clean Rx */ |
128 | if (i >= 1000) | 128 | if (i >= 1000) |
129 | snd_printk("gus midi uart init read - cleanup error\n"); | 129 | snd_printk(KERN_ERR "gus midi uart init read - cleanup error\n"); |
130 | } | 130 | } |
131 | spin_unlock_irqrestore(&gus->uart_cmd_lock, flags); | 131 | spin_unlock_irqrestore(&gus->uart_cmd_lock, flags); |
132 | #if 0 | 132 | #if 0 |
diff --git a/sound/isa/gus/gus_volume.c b/sound/isa/gus/gus_volume.c index 3d36f6c8ee6a..b3382fec5298 100644 --- a/sound/isa/gus/gus_volume.c +++ b/sound/isa/gus/gus_volume.c | |||
@@ -119,7 +119,7 @@ unsigned short snd_gf1_translate_freq(snd_gus_card_t * gus, unsigned int freq16) | |||
119 | freq16 = 50; | 119 | freq16 = 50; |
120 | if (freq16 & 0xf8000000) { | 120 | if (freq16 & 0xf8000000) { |
121 | freq16 = ~0xf8000000; | 121 | freq16 = ~0xf8000000; |
122 | snd_printk("snd_gf1_translate_freq: overflow - freq = 0x%x\n", freq16); | 122 | snd_printk(KERN_ERR "snd_gf1_translate_freq: overflow - freq = 0x%x\n", freq16); |
123 | } | 123 | } |
124 | return ((freq16 << 9) + (gus->gf1.playback_freq >> 1)) / gus->gf1.playback_freq; | 124 | return ((freq16 << 9) + (gus->gf1.playback_freq >> 1)) / gus->gf1.playback_freq; |
125 | } | 125 | } |
@@ -203,14 +203,14 @@ unsigned short snd_gf1_compute_freq(unsigned int freq, | |||
203 | fc = (freq << 10) / rate; | 203 | fc = (freq << 10) / rate; |
204 | if (fc > 97391L) { | 204 | if (fc > 97391L) { |
205 | fc = 97391; | 205 | fc = 97391; |
206 | snd_printk("patch: (1) fc frequency overflow - %u\n", fc); | 206 | snd_printk(KERN_ERR "patch: (1) fc frequency overflow - %u\n", fc); |
207 | } | 207 | } |
208 | fc = (fc * 44100UL) / mix_rate; | 208 | fc = (fc * 44100UL) / mix_rate; |
209 | while (scale--) | 209 | while (scale--) |
210 | fc <<= 1; | 210 | fc <<= 1; |
211 | if (fc > 65535L) { | 211 | if (fc > 65535L) { |
212 | fc = 65535; | 212 | fc = 65535; |
213 | snd_printk("patch: (2) fc frequency overflow - %u\n", fc); | 213 | snd_printk(KERN_ERR "patch: (2) fc frequency overflow - %u\n", fc); |
214 | } | 214 | } |
215 | return (unsigned short) fc; | 215 | return (unsigned short) fc; |
216 | } | 216 | } |
diff --git a/sound/isa/gus/interwave.c b/sound/isa/gus/interwave.c index b101ab0a0dbf..f703a9f4257c 100644 --- a/sound/isa/gus/interwave.c +++ b/sound/isa/gus/interwave.c | |||
@@ -437,7 +437,7 @@ static void __devinit snd_interwave_detect_memory(snd_gus_card_t * gus) | |||
437 | for (i = 0; i < 8; ++i) | 437 | for (i = 0; i < 8; ++i) |
438 | iwave[i] = snd_gf1_peek(gus, bank_pos + i); | 438 | iwave[i] = snd_gf1_peek(gus, bank_pos + i); |
439 | #ifdef CONFIG_SND_DEBUG_ROM | 439 | #ifdef CONFIG_SND_DEBUG_ROM |
440 | printk("ROM at 0x%06x = %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n", bank_pos, | 440 | printk(KERN_DEBUG "ROM at 0x%06x = %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n", bank_pos, |
441 | iwave[0], iwave[1], iwave[2], iwave[3], | 441 | iwave[0], iwave[1], iwave[2], iwave[3], |
442 | iwave[4], iwave[5], iwave[6], iwave[7]); | 442 | iwave[4], iwave[5], iwave[6], iwave[7]); |
443 | #endif | 443 | #endif |
@@ -447,7 +447,7 @@ static void __devinit snd_interwave_detect_memory(snd_gus_card_t * gus) | |||
447 | for (i = 0; i < sizeof(struct rom_hdr); i++) | 447 | for (i = 0; i < sizeof(struct rom_hdr); i++) |
448 | csum += snd_gf1_peek(gus, bank_pos + i); | 448 | csum += snd_gf1_peek(gus, bank_pos + i); |
449 | #ifdef CONFIG_SND_DEBUG_ROM | 449 | #ifdef CONFIG_SND_DEBUG_ROM |
450 | printk("ROM checksum = 0x%x (computed)\n", csum); | 450 | printk(KERN_DEBUG "ROM checksum = 0x%x (computed)\n", csum); |
451 | #endif | 451 | #endif |
452 | if (csum != 0) | 452 | if (csum != 0) |
453 | continue; /* not valid rom */ | 453 | continue; /* not valid rom */ |
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 | } |
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 | ||
diff --git a/sound/pci/als4000.c b/sound/pci/als4000.c index 8a32cd92f62a..7c61561f297f 100644 --- a/sound/pci/als4000.c +++ b/sound/pci/als4000.c | |||
@@ -667,7 +667,7 @@ static int __devinit snd_card_als4000_probe(struct pci_dev *pci, | |||
667 | /* check, if we can restrict PCI DMA transfers to 24 bits */ | 667 | /* check, if we can restrict PCI DMA transfers to 24 bits */ |
668 | if (pci_set_dma_mask(pci, 0x00ffffff) < 0 || | 668 | if (pci_set_dma_mask(pci, 0x00ffffff) < 0 || |
669 | pci_set_consistent_dma_mask(pci, 0x00ffffff) < 0) { | 669 | pci_set_consistent_dma_mask(pci, 0x00ffffff) < 0) { |
670 | snd_printk("architecture does not support 24bit PCI busmaster DMA\n"); | 670 | snd_printk(KERN_ERR "architecture does not support 24bit PCI busmaster DMA\n"); |
671 | pci_disable_device(pci); | 671 | pci_disable_device(pci); |
672 | return -ENXIO; | 672 | return -ENXIO; |
673 | } | 673 | } |
diff --git a/sound/pci/au88x0/au88x0.c b/sound/pci/au88x0/au88x0.c index 04b695d6fd48..6af3b13f2fd1 100644 --- a/sound/pci/au88x0/au88x0.c +++ b/sound/pci/au88x0/au88x0.c | |||
@@ -303,7 +303,7 @@ snd_vortex_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) | |||
303 | if (snd_seq_device_new(card, 1, SNDRV_SEQ_DEV_ID_VORTEX_SYNTH, | 303 | if (snd_seq_device_new(card, 1, SNDRV_SEQ_DEV_ID_VORTEX_SYNTH, |
304 | sizeof(snd_vortex_synth_arg_t), &wave) < 0 | 304 | sizeof(snd_vortex_synth_arg_t), &wave) < 0 |
305 | || wave == NULL) { | 305 | || wave == NULL) { |
306 | snd_printk("Can't initialize Aureal wavetable synth\n"); | 306 | snd_printk(KERN_ERR "Can't initialize Aureal wavetable synth\n"); |
307 | } else { | 307 | } else { |
308 | snd_vortex_synth_arg_t *arg; | 308 | snd_vortex_synth_arg_t *arg; |
309 | 309 | ||
diff --git a/sound/pci/au88x0/au88x0_a3d.c b/sound/pci/au88x0/au88x0_a3d.c index 9ea2ba7bc3c8..d5755db5141f 100644 --- a/sound/pci/au88x0/au88x0_a3d.c +++ b/sound/pci/au88x0/au88x0_a3d.c | |||
@@ -488,7 +488,7 @@ static void a3dsrc_ZeroStateA3D(a3dsrc_t * a) | |||
488 | int i, var, var2; | 488 | int i, var, var2; |
489 | 489 | ||
490 | if ((a->vortex) == NULL) { | 490 | if ((a->vortex) == NULL) { |
491 | printk("vortex: ZeroStateA3D: ERROR: a->vortex is NULL\n"); | 491 | printk(KERN_ERR "vortex: ZeroStateA3D: ERROR: a->vortex is NULL\n"); |
492 | return; | 492 | return; |
493 | } | 493 | } |
494 | 494 | ||
diff --git a/sound/pci/au88x0/au88x0_core.c b/sound/pci/au88x0/au88x0_core.c index 91ac4f3a2aac..5905188d06b5 100644 --- a/sound/pci/au88x0/au88x0_core.c +++ b/sound/pci/au88x0/au88x0_core.c | |||
@@ -2033,7 +2033,7 @@ vortex_adb_checkinout(vortex_t * vortex, int resmap[], int out, int restype) | |||
2033 | } | 2033 | } |
2034 | } | 2034 | } |
2035 | } | 2035 | } |
2036 | printk("vortex: FATAL: ResManager: resource type %d exhausted.\n", restype); | 2036 | printk(KERN_ERR "vortex: FATAL: ResManager: resource type %d exhausted.\n", restype); |
2037 | return -ENOMEM; | 2037 | return -ENOMEM; |
2038 | } | 2038 | } |
2039 | 2039 | ||
@@ -2165,7 +2165,7 @@ vortex_adb_allocroute(vortex_t * vortex, int dma, int nr_ch, int dir, int type) | |||
2165 | memset(stream->resources, 0, | 2165 | memset(stream->resources, 0, |
2166 | sizeof(unsigned char) * | 2166 | sizeof(unsigned char) * |
2167 | VORTEX_RESOURCE_LAST); | 2167 | VORTEX_RESOURCE_LAST); |
2168 | printk("vortex: out of A3D sources. Sorry\n"); | 2168 | printk(KERN_ERR "vortex: out of A3D sources. Sorry\n"); |
2169 | return -EBUSY; | 2169 | return -EBUSY; |
2170 | } | 2170 | } |
2171 | /* (De)Initialize A3D hardware source. */ | 2171 | /* (De)Initialize A3D hardware source. */ |
diff --git a/sound/pci/au88x0/au88x0_eq.c b/sound/pci/au88x0/au88x0_eq.c index 53b47a42c7d8..9d933cc0ea0b 100644 --- a/sound/pci/au88x0/au88x0_eq.c +++ b/sound/pci/au88x0/au88x0_eq.c | |||
@@ -854,7 +854,7 @@ snd_vortex_peaks_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) | |||
854 | 854 | ||
855 | vortex_Eqlzr_GetAllPeaks(vortex, peaks, &count); | 855 | vortex_Eqlzr_GetAllPeaks(vortex, peaks, &count); |
856 | if (count != 20) { | 856 | if (count != 20) { |
857 | printk("vortex: peak count error 20 != %d \n", count); | 857 | printk(KERN_ERR "vortex: peak count error 20 != %d \n", count); |
858 | return -1; | 858 | return -1; |
859 | } | 859 | } |
860 | for (i = 0; i < 20; i++) | 860 | for (i = 0; i < 20; i++) |
diff --git a/sound/pci/au88x0/au88x0_synth.c b/sound/pci/au88x0/au88x0_synth.c index 400417d34609..65f375bad43a 100644 --- a/sound/pci/au88x0/au88x0_synth.c +++ b/sound/pci/au88x0/au88x0_synth.c | |||
@@ -90,7 +90,7 @@ static int vortex_wt_allocroute(vortex_t * vortex, int wt, int nr_ch) | |||
90 | hwwrite(vortex->mmio, WT_PARM(wt, 2), 0); | 90 | hwwrite(vortex->mmio, WT_PARM(wt, 2), 0); |
91 | 91 | ||
92 | temp = hwread(vortex->mmio, WT_PARM(wt, 3)); | 92 | temp = hwread(vortex->mmio, WT_PARM(wt, 3)); |
93 | printk("vortex: WT PARM3: %x\n", temp); | 93 | printk(KERN_DEBUG "vortex: WT PARM3: %x\n", temp); |
94 | //hwwrite(vortex->mmio, WT_PARM(wt, 3), temp); | 94 | //hwwrite(vortex->mmio, WT_PARM(wt, 3), temp); |
95 | 95 | ||
96 | hwwrite(vortex->mmio, WT_DELAY(wt, 0), 0); | 96 | hwwrite(vortex->mmio, WT_DELAY(wt, 0), 0); |
@@ -98,7 +98,7 @@ static int vortex_wt_allocroute(vortex_t * vortex, int wt, int nr_ch) | |||
98 | hwwrite(vortex->mmio, WT_DELAY(wt, 2), 0); | 98 | hwwrite(vortex->mmio, WT_DELAY(wt, 2), 0); |
99 | hwwrite(vortex->mmio, WT_DELAY(wt, 3), 0); | 99 | hwwrite(vortex->mmio, WT_DELAY(wt, 3), 0); |
100 | 100 | ||
101 | printk("vortex: WT GMODE: %x\n", hwread(vortex->mmio, WT_GMODE(wt))); | 101 | printk(KERN_DEBUG "vortex: WT GMODE: %x\n", hwread(vortex->mmio, WT_GMODE(wt))); |
102 | 102 | ||
103 | hwwrite(vortex->mmio, WT_PARM(wt, 2), 0xffffffff); | 103 | hwwrite(vortex->mmio, WT_PARM(wt, 2), 0xffffffff); |
104 | hwwrite(vortex->mmio, WT_PARM(wt, 3), 0xcff1c810); | 104 | hwwrite(vortex->mmio, WT_PARM(wt, 3), 0xcff1c810); |
@@ -106,7 +106,7 @@ static int vortex_wt_allocroute(vortex_t * vortex, int wt, int nr_ch) | |||
106 | voice->parm0 = voice->parm1 = 0xcfb23e2f; | 106 | voice->parm0 = voice->parm1 = 0xcfb23e2f; |
107 | hwwrite(vortex->mmio, WT_PARM(wt, 0), voice->parm0); | 107 | hwwrite(vortex->mmio, WT_PARM(wt, 0), voice->parm0); |
108 | hwwrite(vortex->mmio, WT_PARM(wt, 1), voice->parm1); | 108 | hwwrite(vortex->mmio, WT_PARM(wt, 1), voice->parm1); |
109 | printk("vortex: WT GMODE 2 : %x\n", hwread(vortex->mmio, WT_GMODE(wt))); | 109 | printk(KERN_DEBUG "vortex: WT GMODE 2 : %x\n", hwread(vortex->mmio, WT_GMODE(wt))); |
110 | return 0; | 110 | return 0; |
111 | } | 111 | } |
112 | 112 | ||
@@ -203,7 +203,7 @@ vortex_wt_SetReg(vortex_t * vortex, unsigned char reg, int wt, | |||
203 | } | 203 | } |
204 | } else { | 204 | } else { |
205 | if (wt >= NR_WT) { | 205 | if (wt >= NR_WT) { |
206 | printk("vortex: WT SetReg: voice out of range\n"); | 206 | printk(KERN_ERR "vortex: WT SetReg: voice out of range\n"); |
207 | return 0; | 207 | return 0; |
208 | } | 208 | } |
209 | } | 209 | } |
diff --git a/sound/pci/azt3328.c b/sound/pci/azt3328.c index dc638f395c02..8260079a25fd 100644 --- a/sound/pci/azt3328.c +++ b/sound/pci/azt3328.c | |||
@@ -669,7 +669,7 @@ static void snd_azf3328_setfmt(azf3328_t *chip, | |||
669 | case 48000: val |= 0x06; break; | 669 | case 48000: val |= 0x06; break; |
670 | case 64000: val |= 0x07; break; | 670 | case 64000: val |= 0x07; break; |
671 | default: | 671 | default: |
672 | snd_printk("unknown bitrate %d, assuming 44.1kHz!\n", bitrate); | 672 | snd_printk(KERN_WARNING "unknown bitrate %d, assuming 44.1kHz!\n", bitrate); |
673 | val |= 0x05; /* 44100 */ | 673 | val |= 0x05; /* 44100 */ |
674 | break; | 674 | break; |
675 | } | 675 | } |
@@ -854,10 +854,10 @@ static int snd_azf3328_playback_trigger(snd_pcm_substream_t * substream, int cmd | |||
854 | chip->is_playing = 0; | 854 | chip->is_playing = 0; |
855 | break; | 855 | break; |
856 | case SNDRV_PCM_TRIGGER_PAUSE_PUSH: | 856 | case SNDRV_PCM_TRIGGER_PAUSE_PUSH: |
857 | snd_printk("FIXME: SNDRV_PCM_TRIGGER_PAUSE_PUSH NIY!\n"); | 857 | snd_printk(KERN_ERR "FIXME: SNDRV_PCM_TRIGGER_PAUSE_PUSH NIY!\n"); |
858 | break; | 858 | break; |
859 | case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: | 859 | case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: |
860 | snd_printk("FIXME: SNDRV_PCM_TRIGGER_PAUSE_RELEASE NIY!\n"); | 860 | snd_printk(KERN_ERR "FIXME: SNDRV_PCM_TRIGGER_PAUSE_RELEASE NIY!\n"); |
861 | break; | 861 | break; |
862 | default: | 862 | default: |
863 | return -EINVAL; | 863 | return -EINVAL; |
@@ -935,10 +935,10 @@ static int snd_azf3328_capture_trigger(snd_pcm_substream_t * substream, int cmd) | |||
935 | chip->is_playing = 0; | 935 | chip->is_playing = 0; |
936 | break; | 936 | break; |
937 | case SNDRV_PCM_TRIGGER_PAUSE_PUSH: | 937 | case SNDRV_PCM_TRIGGER_PAUSE_PUSH: |
938 | snd_printk("FIXME: SNDRV_PCM_TRIGGER_PAUSE_PUSH NIY!\n"); | 938 | snd_printk(KERN_ERR "FIXME: SNDRV_PCM_TRIGGER_PAUSE_PUSH NIY!\n"); |
939 | break; | 939 | break; |
940 | case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: | 940 | case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: |
941 | snd_printk("FIXME: SNDRV_PCM_TRIGGER_PAUSE_RELEASE NIY!\n"); | 941 | snd_printk(KERN_ERR "FIXME: SNDRV_PCM_TRIGGER_PAUSE_RELEASE NIY!\n"); |
942 | break; | 942 | break; |
943 | default: | 943 | default: |
944 | return -EINVAL; | 944 | return -EINVAL; |
@@ -1356,7 +1356,7 @@ static int __devinit snd_azf3328_create(snd_card_t * card, | |||
1356 | /* check if we can restrict PCI DMA transfers to 24 bits */ | 1356 | /* check if we can restrict PCI DMA transfers to 24 bits */ |
1357 | if (pci_set_dma_mask(pci, 0x00ffffff) < 0 || | 1357 | if (pci_set_dma_mask(pci, 0x00ffffff) < 0 || |
1358 | pci_set_consistent_dma_mask(pci, 0x00ffffff) < 0) { | 1358 | pci_set_consistent_dma_mask(pci, 0x00ffffff) < 0) { |
1359 | snd_printk("architecture does not support 24bit PCI busmaster DMA\n"); | 1359 | snd_printk(KERN_ERR "architecture does not support 24bit PCI busmaster DMA\n"); |
1360 | pci_disable_device(pci); | 1360 | pci_disable_device(pci); |
1361 | return -ENXIO; | 1361 | return -ENXIO; |
1362 | } | 1362 | } |
@@ -1374,7 +1374,7 @@ static int __devinit snd_azf3328_create(snd_card_t * card, | |||
1374 | chip->mixer_port = pci_resource_start(pci, 4); | 1374 | chip->mixer_port = pci_resource_start(pci, 4); |
1375 | 1375 | ||
1376 | if (request_irq(pci->irq, snd_azf3328_interrupt, SA_INTERRUPT|SA_SHIRQ, card->shortname, (void *)chip)) { | 1376 | if (request_irq(pci->irq, snd_azf3328_interrupt, SA_INTERRUPT|SA_SHIRQ, card->shortname, (void *)chip)) { |
1377 | snd_printk("unable to grab IRQ %d\n", pci->irq); | 1377 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
1378 | snd_azf3328_free(chip); | 1378 | snd_azf3328_free(chip); |
1379 | return -EBUSY; | 1379 | return -EBUSY; |
1380 | } | 1380 | } |
@@ -1450,7 +1450,7 @@ static int __devinit snd_azf3328_probe(struct pci_dev *pci, | |||
1450 | if ((err = snd_mpu401_uart_new( card, 0, MPU401_HW_MPU401, | 1450 | if ((err = snd_mpu401_uart_new( card, 0, MPU401_HW_MPU401, |
1451 | chip->mpu_port, 1, pci->irq, 0, | 1451 | chip->mpu_port, 1, pci->irq, 0, |
1452 | &chip->rmidi)) < 0) { | 1452 | &chip->rmidi)) < 0) { |
1453 | snd_printk("azf3328: no MPU-401 device at 0x%lx?\n", chip->mpu_port); | 1453 | snd_printk(KERN_ERR "azf3328: no MPU-401 device at 0x%lx?\n", chip->mpu_port); |
1454 | snd_card_free(card); | 1454 | snd_card_free(card); |
1455 | return err; | 1455 | return err; |
1456 | } | 1456 | } |
@@ -1462,7 +1462,7 @@ static int __devinit snd_azf3328_probe(struct pci_dev *pci, | |||
1462 | 1462 | ||
1463 | if (snd_opl3_create(card, chip->synth_port, chip->synth_port+2, | 1463 | if (snd_opl3_create(card, chip->synth_port, chip->synth_port+2, |
1464 | OPL3_HW_AUTO, 1, &opl3) < 0) { | 1464 | OPL3_HW_AUTO, 1, &opl3) < 0) { |
1465 | snd_printk("azf3328: no OPL3 device at 0x%lx-0x%lx?\n", | 1465 | snd_printk(KERN_ERR "azf3328: no OPL3 device at 0x%lx-0x%lx?\n", |
1466 | chip->synth_port, chip->synth_port+2 ); | 1466 | chip->synth_port, chip->synth_port+2 ); |
1467 | } else { | 1467 | } else { |
1468 | if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) < 0) { | 1468 | if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) < 0) { |
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c index 0d9d8923fbbb..f6920ef5b4ea 100644 --- a/sound/pci/ca0106/ca0106_main.c +++ b/sound/pci/ca0106/ca0106_main.c | |||
@@ -281,7 +281,7 @@ int snd_ca0106_i2c_write(ca0106_t *emu, | |||
281 | int retry; | 281 | int retry; |
282 | if ((reg > 0x7f) || (value > 0x1ff)) | 282 | if ((reg > 0x7f) || (value > 0x1ff)) |
283 | { | 283 | { |
284 | snd_printk("i2c_write: invalid values.\n"); | 284 | snd_printk(KERN_ERR "i2c_write: invalid values.\n"); |
285 | return -EINVAL; | 285 | return -EINVAL; |
286 | } | 286 | } |
287 | 287 | ||
@@ -319,7 +319,7 @@ int snd_ca0106_i2c_write(ca0106_t *emu, | |||
319 | 319 | ||
320 | if(retry==10) | 320 | if(retry==10) |
321 | { | 321 | { |
322 | snd_printk("Writing to ADC failed!\n"); | 322 | snd_printk(KERN_ERR "Writing to ADC failed!\n"); |
323 | return -EINVAL; | 323 | return -EINVAL; |
324 | } | 324 | } |
325 | 325 | ||
@@ -421,7 +421,7 @@ static int snd_ca0106_pcm_open_capture_channel(snd_pcm_substream_t *substream, i | |||
421 | 421 | ||
422 | epcm = kzalloc(sizeof(*epcm), GFP_KERNEL); | 422 | epcm = kzalloc(sizeof(*epcm), GFP_KERNEL); |
423 | if (epcm == NULL) { | 423 | if (epcm == NULL) { |
424 | snd_printk("open_capture_channel: failed epcm alloc\n"); | 424 | snd_printk(KERN_ERR "open_capture_channel: failed epcm alloc\n"); |
425 | return -ENOMEM; | 425 | return -ENOMEM; |
426 | } | 426 | } |
427 | epcm->emu = chip; | 427 | epcm->emu = chip; |
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c index db093bca2cd0..57e8e433d56f 100644 --- a/sound/pci/cmipci.c +++ b/sound/pci/cmipci.c | |||
@@ -2839,7 +2839,7 @@ static int __devinit snd_cmipci_create(snd_card_t *card, struct pci_dev *pci, | |||
2839 | cm->iobase = pci_resource_start(pci, 0); | 2839 | cm->iobase = pci_resource_start(pci, 0); |
2840 | 2840 | ||
2841 | if (request_irq(pci->irq, snd_cmipci_interrupt, SA_INTERRUPT|SA_SHIRQ, card->driver, (void *)cm)) { | 2841 | if (request_irq(pci->irq, snd_cmipci_interrupt, SA_INTERRUPT|SA_SHIRQ, card->driver, (void *)cm)) { |
2842 | snd_printk("unable to grab IRQ %d\n", pci->irq); | 2842 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
2843 | snd_cmipci_free(cm); | 2843 | snd_cmipci_free(cm); |
2844 | return -EBUSY; | 2844 | return -EBUSY; |
2845 | } | 2845 | } |
diff --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c index 147836f09dcf..9b8af5bcbb04 100644 --- a/sound/pci/cs46xx/cs46xx_lib.c +++ b/sound/pci/cs46xx/cs46xx_lib.c | |||
@@ -163,7 +163,7 @@ static unsigned short snd_cs46xx_codec_read(cs46xx_t *chip, | |||
163 | goto ok1; | 163 | goto ok1; |
164 | } | 164 | } |
165 | 165 | ||
166 | snd_printk("AC'97 read problem (ACCTL_DCV), reg = 0x%x\n", reg); | 166 | snd_printk(KERN_ERR "AC'97 read problem (ACCTL_DCV), reg = 0x%x\n", reg); |
167 | result = 0xffff; | 167 | result = 0xffff; |
168 | goto end; | 168 | goto end; |
169 | 169 | ||
@@ -182,7 +182,7 @@ static unsigned short snd_cs46xx_codec_read(cs46xx_t *chip, | |||
182 | udelay(10); | 182 | udelay(10); |
183 | } | 183 | } |
184 | 184 | ||
185 | snd_printk("AC'97 read problem (ACSTS_VSTS), codec_index %d, reg = 0x%x\n", codec_index, reg); | 185 | snd_printk(KERN_ERR "AC'97 read problem (ACSTS_VSTS), codec_index %d, reg = 0x%x\n", codec_index, reg); |
186 | result = 0xffff; | 186 | result = 0xffff; |
187 | goto end; | 187 | goto end; |
188 | 188 | ||
@@ -281,7 +281,7 @@ static void snd_cs46xx_codec_write(cs46xx_t *chip, | |||
281 | goto end; | 281 | goto end; |
282 | } | 282 | } |
283 | } | 283 | } |
284 | snd_printk("AC'97 write problem, codec_index = %d, reg = 0x%x, val = 0x%x\n", codec_index, reg, val); | 284 | snd_printk(KERN_ERR "AC'97 write problem, codec_index = %d, reg = 0x%x, val = 0x%x\n", codec_index, reg, val); |
285 | end: | 285 | end: |
286 | chip->active_ctrl(chip, -1); | 286 | chip->active_ctrl(chip, -1); |
287 | } | 287 | } |
@@ -510,7 +510,7 @@ static void snd_cs46xx_proc_start(cs46xx_t *chip) | |||
510 | } | 510 | } |
511 | 511 | ||
512 | if (snd_cs46xx_peek(chip, BA1_SPCR) & SPCR_RUNFR) | 512 | if (snd_cs46xx_peek(chip, BA1_SPCR) & SPCR_RUNFR) |
513 | snd_printk("SPCR_RUNFR never reset\n"); | 513 | snd_printk(KERN_ERR "SPCR_RUNFR never reset\n"); |
514 | } | 514 | } |
515 | 515 | ||
516 | static void snd_cs46xx_proc_stop(cs46xx_t *chip) | 516 | static void snd_cs46xx_proc_stop(cs46xx_t *chip) |
@@ -2403,7 +2403,7 @@ static void snd_cs46xx_codec_reset (ac97_t * ac97) | |||
2403 | msleep(10); | 2403 | msleep(10); |
2404 | } while (time_after_eq(end_time, jiffies)); | 2404 | } while (time_after_eq(end_time, jiffies)); |
2405 | 2405 | ||
2406 | snd_printk("CS46xx secondary codec dont respond!\n"); | 2406 | snd_printk(KERN_ERR "CS46xx secondary codec doesn't respond!\n"); |
2407 | } | 2407 | } |
2408 | #endif | 2408 | #endif |
2409 | 2409 | ||
@@ -3072,8 +3072,8 @@ static int snd_cs46xx_chip_init(cs46xx_t *chip) | |||
3072 | } | 3072 | } |
3073 | 3073 | ||
3074 | 3074 | ||
3075 | snd_printk("create - never read codec ready from AC'97\n"); | 3075 | snd_printk(KERN_ERR "create - never read codec ready from AC'97\n"); |
3076 | snd_printk("it is not probably bug, try to use CS4236 driver\n"); | 3076 | snd_printk(KERN_ERR "it is not probably bug, try to use CS4236 driver\n"); |
3077 | return -EIO; | 3077 | return -EIO; |
3078 | ok1: | 3078 | ok1: |
3079 | #ifdef CONFIG_SND_CS46XX_NEW_DSP | 3079 | #ifdef CONFIG_SND_CS46XX_NEW_DSP |
@@ -3121,17 +3121,17 @@ static int snd_cs46xx_chip_init(cs46xx_t *chip) | |||
3121 | } | 3121 | } |
3122 | 3122 | ||
3123 | #ifndef CONFIG_SND_CS46XX_NEW_DSP | 3123 | #ifndef CONFIG_SND_CS46XX_NEW_DSP |
3124 | snd_printk("create - never read ISV3 & ISV4 from AC'97\n"); | 3124 | snd_printk(KERN_ERR "create - never read ISV3 & ISV4 from AC'97\n"); |
3125 | return -EIO; | 3125 | return -EIO; |
3126 | #else | 3126 | #else |
3127 | /* This may happen on a cold boot with a Terratec SiXPack 5.1. | 3127 | /* This may happen on a cold boot with a Terratec SiXPack 5.1. |
3128 | Reloading the driver may help, if there's other soundcards | 3128 | Reloading the driver may help, if there's other soundcards |
3129 | with the same problem I would like to know. (Benny) */ | 3129 | with the same problem I would like to know. (Benny) */ |
3130 | 3130 | ||
3131 | snd_printk("ERROR: snd-cs46xx: never read ISV3 & ISV4 from AC'97\n"); | 3131 | snd_printk(KERN_ERR "ERROR: snd-cs46xx: never read ISV3 & ISV4 from AC'97\n"); |
3132 | snd_printk(" Try reloading the ALSA driver, if you find something\n"); | 3132 | snd_printk(KERN_ERR " Try reloading the ALSA driver, if you find something\n"); |
3133 | snd_printk(" broken or not working on your soundcard upon\n"); | 3133 | snd_printk(KERN_ERR " broken or not working on your soundcard upon\n"); |
3134 | snd_printk(" this message please report to alsa-devel@lists.sourceforge.net\n"); | 3134 | snd_printk(KERN_ERR " this message please report to alsa-devel@lists.sourceforge.net\n"); |
3135 | 3135 | ||
3136 | return -EIO; | 3136 | return -EIO; |
3137 | #endif | 3137 | #endif |
@@ -3212,7 +3212,7 @@ int __devinit snd_cs46xx_start_dsp(cs46xx_t *chip) | |||
3212 | #else | 3212 | #else |
3213 | /* old image */ | 3213 | /* old image */ |
3214 | if (snd_cs46xx_download_image(chip) < 0) { | 3214 | if (snd_cs46xx_download_image(chip) < 0) { |
3215 | snd_printk("image download error\n"); | 3215 | snd_printk(KERN_ERR "image download error\n"); |
3216 | return -EIO; | 3216 | return -EIO; |
3217 | } | 3217 | } |
3218 | 3218 | ||
@@ -3787,7 +3787,7 @@ int __devinit snd_cs46xx_create(snd_card_t * card, | |||
3787 | chip->ba1_addr = pci_resource_start(pci, 1); | 3787 | chip->ba1_addr = pci_resource_start(pci, 1); |
3788 | if (chip->ba0_addr == 0 || chip->ba0_addr == (unsigned long)~0 || | 3788 | if (chip->ba0_addr == 0 || chip->ba0_addr == (unsigned long)~0 || |
3789 | chip->ba1_addr == 0 || chip->ba1_addr == (unsigned long)~0) { | 3789 | chip->ba1_addr == 0 || chip->ba1_addr == (unsigned long)~0) { |
3790 | snd_printk("wrong address(es) - ba0 = 0x%lx, ba1 = 0x%lx\n", chip->ba0_addr, chip->ba1_addr); | 3790 | snd_printk(KERN_ERR "wrong address(es) - ba0 = 0x%lx, ba1 = 0x%lx\n", chip->ba0_addr, chip->ba1_addr); |
3791 | snd_cs46xx_free(chip); | 3791 | snd_cs46xx_free(chip); |
3792 | return -ENOMEM; | 3792 | return -ENOMEM; |
3793 | } | 3793 | } |
@@ -3836,12 +3836,12 @@ int __devinit snd_cs46xx_create(snd_card_t * card, | |||
3836 | } | 3836 | } |
3837 | 3837 | ||
3838 | if (external_amp) { | 3838 | if (external_amp) { |
3839 | snd_printk("Crystal EAPD support forced on.\n"); | 3839 | snd_printk(KERN_INFO "Crystal EAPD support forced on.\n"); |
3840 | chip->amplifier_ctrl = amp_voyetra; | 3840 | chip->amplifier_ctrl = amp_voyetra; |
3841 | } | 3841 | } |
3842 | 3842 | ||
3843 | if (thinkpad) { | 3843 | if (thinkpad) { |
3844 | snd_printk("Activating CLKRUN hack for Thinkpad.\n"); | 3844 | snd_printk(KERN_INFO "Activating CLKRUN hack for Thinkpad.\n"); |
3845 | chip->active_ctrl = clkrun_hack; | 3845 | chip->active_ctrl = clkrun_hack; |
3846 | clkrun_init(chip); | 3846 | clkrun_init(chip); |
3847 | } | 3847 | } |
@@ -3858,20 +3858,20 @@ int __devinit snd_cs46xx_create(snd_card_t * card, | |||
3858 | for (idx = 0; idx < 5; idx++) { | 3858 | for (idx = 0; idx < 5; idx++) { |
3859 | region = &chip->region.idx[idx]; | 3859 | region = &chip->region.idx[idx]; |
3860 | if ((region->resource = request_mem_region(region->base, region->size, region->name)) == NULL) { | 3860 | if ((region->resource = request_mem_region(region->base, region->size, region->name)) == NULL) { |
3861 | snd_printk("unable to request memory region 0x%lx-0x%lx\n", region->base, region->base + region->size - 1); | 3861 | snd_printk(KERN_ERR "unable to request memory region 0x%lx-0x%lx\n", region->base, region->base + region->size - 1); |
3862 | snd_cs46xx_free(chip); | 3862 | snd_cs46xx_free(chip); |
3863 | return -EBUSY; | 3863 | return -EBUSY; |
3864 | } | 3864 | } |
3865 | region->remap_addr = ioremap_nocache(region->base, region->size); | 3865 | region->remap_addr = ioremap_nocache(region->base, region->size); |
3866 | if (region->remap_addr == NULL) { | 3866 | if (region->remap_addr == NULL) { |
3867 | snd_printk("%s ioremap problem\n", region->name); | 3867 | snd_printk(KERN_ERR "%s ioremap problem\n", region->name); |
3868 | snd_cs46xx_free(chip); | 3868 | snd_cs46xx_free(chip); |
3869 | return -ENOMEM; | 3869 | return -ENOMEM; |
3870 | } | 3870 | } |
3871 | } | 3871 | } |
3872 | 3872 | ||
3873 | if (request_irq(pci->irq, snd_cs46xx_interrupt, SA_INTERRUPT|SA_SHIRQ, "CS46XX", (void *) chip)) { | 3873 | if (request_irq(pci->irq, snd_cs46xx_interrupt, SA_INTERRUPT|SA_SHIRQ, "CS46XX", (void *) chip)) { |
3874 | snd_printk("unable to grab IRQ %d\n", pci->irq); | 3874 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
3875 | snd_cs46xx_free(chip); | 3875 | snd_cs46xx_free(chip); |
3876 | return -EBUSY; | 3876 | return -EBUSY; |
3877 | } | 3877 | } |
diff --git a/sound/pci/emu10k1/emu10k1.c b/sound/pci/emu10k1/emu10k1.c index b0e00f0a7c2f..dd1ea9d3b81a 100644 --- a/sound/pci/emu10k1/emu10k1.c +++ b/sound/pci/emu10k1/emu10k1.c | |||
@@ -188,7 +188,7 @@ static int __devinit snd_card_emu10k1_probe(struct pci_dev *pci, | |||
188 | if (snd_seq_device_new(card, 1, SNDRV_SEQ_DEV_ID_EMU10K1_SYNTH, | 188 | if (snd_seq_device_new(card, 1, SNDRV_SEQ_DEV_ID_EMU10K1_SYNTH, |
189 | sizeof(snd_emu10k1_synth_arg_t), &wave) < 0 || | 189 | sizeof(snd_emu10k1_synth_arg_t), &wave) < 0 || |
190 | wave == NULL) { | 190 | wave == NULL) { |
191 | snd_printk("can't initialize Emu10k1 wavetable synth\n"); | 191 | snd_printk(KERN_WARNING "can't initialize Emu10k1 wavetable synth\n"); |
192 | } else { | 192 | } else { |
193 | snd_emu10k1_synth_arg_t *arg; | 193 | snd_emu10k1_synth_arg_t *arg; |
194 | arg = SNDRV_SEQ_DEVICE_ARGPTR(wave); | 194 | arg = SNDRV_SEQ_DEVICE_ARGPTR(wave); |
diff --git a/sound/pci/emu10k1/emufx.c b/sound/pci/emu10k1/emufx.c index 177c4ad0f778..03e8c1678952 100644 --- a/sound/pci/emu10k1/emufx.c +++ b/sound/pci/emu10k1/emufx.c | |||
@@ -1392,7 +1392,7 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input)) | |||
1392 | A_SWITCH(icode, &ptr, tmp + 1, playback + SND_EMU10K1_PLAYBACK_CHANNELS + z, tmp + 1); | 1392 | A_SWITCH(icode, &ptr, tmp + 1, playback + SND_EMU10K1_PLAYBACK_CHANNELS + z, tmp + 1); |
1393 | if ((z==1) && (emu->card_capabilities->spdif_bug)) { | 1393 | if ((z==1) && (emu->card_capabilities->spdif_bug)) { |
1394 | /* Due to a SPDIF output bug on some Audigy cards, this code delays the Right channel by 1 sample */ | 1394 | /* Due to a SPDIF output bug on some Audigy cards, this code delays the Right channel by 1 sample */ |
1395 | snd_printk("Installing spdif_bug patch: %s\n", emu->card_capabilities->name); | 1395 | snd_printk(KERN_INFO "Installing spdif_bug patch: %s\n", emu->card_capabilities->name); |
1396 | A_OP(icode, &ptr, iACC3, A_EXTOUT(A_EXTOUT_FRONT_L + z), A_GPR(gpr - 3), A_C_00000000, A_C_00000000); | 1396 | A_OP(icode, &ptr, iACC3, A_EXTOUT(A_EXTOUT_FRONT_L + z), A_GPR(gpr - 3), A_C_00000000, A_C_00000000); |
1397 | A_OP(icode, &ptr, iACC3, A_GPR(gpr - 3), A_GPR(tmp + 0), A_GPR(tmp + 1), A_C_00000000); | 1397 | A_OP(icode, &ptr, iACC3, A_GPR(gpr - 3), A_GPR(tmp + 0), A_GPR(tmp + 1), A_C_00000000); |
1398 | } else { | 1398 | } else { |
diff --git a/sound/pci/emu10k1/irq.c b/sound/pci/emu10k1/irq.c index cd8460d56752..594ea063b140 100644 --- a/sound/pci/emu10k1/irq.c +++ b/sound/pci/emu10k1/irq.c | |||
@@ -41,7 +41,7 @@ irqreturn_t snd_emu10k1_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
41 | orig_status = status; | 41 | orig_status = status; |
42 | handled = 1; | 42 | handled = 1; |
43 | if (status & IPR_PCIERROR) { | 43 | if (status & IPR_PCIERROR) { |
44 | snd_printk("interrupt: PCI error\n"); | 44 | snd_printk(KERN_ERR "interrupt: PCI error\n"); |
45 | snd_emu10k1_intr_disable(emu, INTE_PCIERRORENABLE); | 45 | snd_emu10k1_intr_disable(emu, INTE_PCIERRORENABLE); |
46 | status &= ~IPR_PCIERROR; | 46 | status &= ~IPR_PCIERROR; |
47 | } | 47 | } |
diff --git a/sound/pci/emu10k1/memory.c b/sound/pci/emu10k1/memory.c index 6afeaeab3e13..d42e4aeaa73a 100644 --- a/sound/pci/emu10k1/memory.c +++ b/sound/pci/emu10k1/memory.c | |||
@@ -232,11 +232,11 @@ __found_pages: | |||
232 | static int is_valid_page(emu10k1_t *emu, dma_addr_t addr) | 232 | static int is_valid_page(emu10k1_t *emu, dma_addr_t addr) |
233 | { | 233 | { |
234 | if (addr & ~emu->dma_mask) { | 234 | if (addr & ~emu->dma_mask) { |
235 | snd_printk("max memory size is 0x%lx (addr = 0x%lx)!!\n", emu->dma_mask, (unsigned long)addr); | 235 | snd_printk(KERN_ERR "max memory size is 0x%lx (addr = 0x%lx)!!\n", emu->dma_mask, (unsigned long)addr); |
236 | return 0; | 236 | return 0; |
237 | } | 237 | } |
238 | if (addr & (EMUPAGESIZE-1)) { | 238 | if (addr & (EMUPAGESIZE-1)) { |
239 | snd_printk("page is not aligned\n"); | 239 | snd_printk(KERN_ERR "page is not aligned\n"); |
240 | return 0; | 240 | return 0; |
241 | } | 241 | } |
242 | return 1; | 242 | return 1; |
@@ -501,7 +501,7 @@ static inline void *offset_ptr(emu10k1_t *emu, int page, int offset) | |||
501 | snd_assert(page >= 0 && page < emu->max_cache_pages, return NULL); | 501 | snd_assert(page >= 0 && page < emu->max_cache_pages, return NULL); |
502 | ptr = emu->page_ptr_table[page]; | 502 | ptr = emu->page_ptr_table[page]; |
503 | if (! ptr) { | 503 | if (! ptr) { |
504 | printk("emu10k1: access to NULL ptr: page = %d\n", page); | 504 | printk(KERN_ERR "emu10k1: access to NULL ptr: page = %d\n", page); |
505 | return NULL; | 505 | return NULL; |
506 | } | 506 | } |
507 | ptr += offset & (PAGE_SIZE - 1); | 507 | ptr += offset & (PAGE_SIZE - 1); |
diff --git a/sound/pci/emu10k1/p16v.c b/sound/pci/emu10k1/p16v.c index d59c7f345ad6..e27ebb9bb74a 100644 --- a/sound/pci/emu10k1/p16v.c +++ b/sound/pci/emu10k1/p16v.c | |||
@@ -546,7 +546,7 @@ snd_p16v_pcm_pointer_capture(snd_pcm_substream_t *substream) | |||
546 | ptr=ptr2; | 546 | ptr=ptr2; |
547 | if (ptr >= runtime->buffer_size) { | 547 | if (ptr >= runtime->buffer_size) { |
548 | ptr -= runtime->buffer_size; | 548 | ptr -= runtime->buffer_size; |
549 | printk("buffer capture limited!\n"); | 549 | printk(KERN_WARNING "buffer capture limited!\n"); |
550 | } | 550 | } |
551 | //printk("ptr1 = 0x%lx, ptr2=0x%lx, ptr=0x%lx, buffer_size = 0x%x, period_size = 0x%x, bits=%d, rate=%d\n", ptr1, ptr2, ptr, (int)runtime->buffer_size, (int)runtime->period_size, (int)runtime->frame_bits, (int)runtime->rate); | 551 | //printk("ptr1 = 0x%lx, ptr2=0x%lx, ptr=0x%lx, buffer_size = 0x%x, period_size = 0x%x, bits=%d, rate=%d\n", ptr1, ptr2, ptr, (int)runtime->buffer_size, (int)runtime->period_size, (int)runtime->frame_bits, (int)runtime->rate); |
552 | 552 | ||
diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c index bef9a59f46d7..b4d0a9c2b0b5 100644 --- a/sound/pci/ens1370.c +++ b/sound/pci/ens1370.c | |||
@@ -508,7 +508,7 @@ static unsigned int snd_es1371_wait_src_ready(ensoniq_t * ensoniq) | |||
508 | return r; | 508 | return r; |
509 | cond_resched(); | 509 | cond_resched(); |
510 | } | 510 | } |
511 | snd_printk("wait source ready timeout 0x%lx [0x%x]\n", ES_REG(ensoniq, 1371_SMPRATE), r); | 511 | snd_printk(KERN_ERR "wait source ready timeout 0x%lx [0x%x]\n", ES_REG(ensoniq, 1371_SMPRATE), r); |
512 | return 0; | 512 | return 0; |
513 | } | 513 | } |
514 | 514 | ||
@@ -579,7 +579,7 @@ static void snd_es1370_codec_write(ak4531_t *ak4531, | |||
579 | set_current_state(TASK_UNINTERRUPTIBLE); | 579 | set_current_state(TASK_UNINTERRUPTIBLE); |
580 | schedule_timeout(1); | 580 | schedule_timeout(1); |
581 | } while (time_after(end_time, jiffies)); | 581 | } while (time_after(end_time, jiffies)); |
582 | snd_printk("codec write timeout, status = 0x%x\n", inl(ES_REG(ensoniq, STATUS))); | 582 | snd_printk(KERN_ERR "codec write timeout, status = 0x%x\n", inl(ES_REG(ensoniq, STATUS))); |
583 | } | 583 | } |
584 | 584 | ||
585 | #endif /* CHIP1370 */ | 585 | #endif /* CHIP1370 */ |
@@ -620,7 +620,7 @@ static void snd_es1371_codec_write(ac97_t *ac97, | |||
620 | } | 620 | } |
621 | } | 621 | } |
622 | up(&ensoniq->src_mutex); | 622 | up(&ensoniq->src_mutex); |
623 | snd_printk("codec write timeout at 0x%lx [0x%x]\n", ES_REG(ensoniq, 1371_CODEC), inl(ES_REG(ensoniq, 1371_CODEC))); | 623 | snd_printk(KERN_ERR "codec write timeout at 0x%lx [0x%x]\n", ES_REG(ensoniq, 1371_CODEC), inl(ES_REG(ensoniq, 1371_CODEC))); |
624 | } | 624 | } |
625 | 625 | ||
626 | static unsigned short snd_es1371_codec_read(ac97_t *ac97, | 626 | static unsigned short snd_es1371_codec_read(ac97_t *ac97, |
@@ -667,14 +667,14 @@ static unsigned short snd_es1371_codec_read(ac97_t *ac97, | |||
667 | } | 667 | } |
668 | up(&ensoniq->src_mutex); | 668 | up(&ensoniq->src_mutex); |
669 | if (++fail > 10) { | 669 | if (++fail > 10) { |
670 | snd_printk("codec read timeout (final) at 0x%lx, reg = 0x%x [0x%x]\n", ES_REG(ensoniq, 1371_CODEC), reg, inl(ES_REG(ensoniq, 1371_CODEC))); | 670 | snd_printk(KERN_ERR "codec read timeout (final) at 0x%lx, reg = 0x%x [0x%x]\n", ES_REG(ensoniq, 1371_CODEC), reg, inl(ES_REG(ensoniq, 1371_CODEC))); |
671 | return 0; | 671 | return 0; |
672 | } | 672 | } |
673 | goto __again; | 673 | goto __again; |
674 | } | 674 | } |
675 | } | 675 | } |
676 | up(&ensoniq->src_mutex); | 676 | up(&ensoniq->src_mutex); |
677 | snd_printk("es1371: codec read timeout at 0x%lx [0x%x]\n", ES_REG(ensoniq, 1371_CODEC), inl(ES_REG(ensoniq, 1371_CODEC))); | 677 | snd_printk(KERN_ERR "es1371: codec read timeout at 0x%lx [0x%x]\n", ES_REG(ensoniq, 1371_CODEC), inl(ES_REG(ensoniq, 1371_CODEC))); |
678 | return 0; | 678 | return 0; |
679 | } | 679 | } |
680 | 680 | ||
@@ -1960,7 +1960,7 @@ static int __devinit snd_ensoniq_create(snd_card_t * card, | |||
1960 | } | 1960 | } |
1961 | ensoniq->port = pci_resource_start(pci, 0); | 1961 | ensoniq->port = pci_resource_start(pci, 0); |
1962 | if (request_irq(pci->irq, snd_audiopci_interrupt, SA_INTERRUPT|SA_SHIRQ, "Ensoniq AudioPCI", (void *)ensoniq)) { | 1962 | if (request_irq(pci->irq, snd_audiopci_interrupt, SA_INTERRUPT|SA_SHIRQ, "Ensoniq AudioPCI", (void *)ensoniq)) { |
1963 | snd_printk("unable to grab IRQ %d\n", pci->irq); | 1963 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
1964 | snd_ensoniq_free(ensoniq); | 1964 | snd_ensoniq_free(ensoniq); |
1965 | return -EBUSY; | 1965 | return -EBUSY; |
1966 | } | 1966 | } |
@@ -1968,7 +1968,7 @@ static int __devinit snd_ensoniq_create(snd_card_t * card, | |||
1968 | #ifdef CHIP1370 | 1968 | #ifdef CHIP1370 |
1969 | if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci), | 1969 | if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci), |
1970 | 16, &ensoniq->dma_bug) < 0) { | 1970 | 16, &ensoniq->dma_bug) < 0) { |
1971 | snd_printk("unable to allocate space for phantom area - dma_bug\n"); | 1971 | snd_printk(KERN_ERR "unable to allocate space for phantom area - dma_bug\n"); |
1972 | snd_ensoniq_free(ensoniq); | 1972 | snd_ensoniq_free(ensoniq); |
1973 | return -EBUSY; | 1973 | return -EBUSY; |
1974 | } | 1974 | } |
diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c index 7bfbdfc2f8bc..78f90defcab1 100644 --- a/sound/pci/es1938.c +++ b/sound/pci/es1938.c | |||
@@ -267,7 +267,7 @@ static void snd_es1938_mixer_write(es1938_t *chip, unsigned char reg, unsigned c | |||
267 | outb(val, SLSB_REG(chip, MIXERDATA)); | 267 | outb(val, SLSB_REG(chip, MIXERDATA)); |
268 | spin_unlock_irqrestore(&chip->mixer_lock, flags); | 268 | spin_unlock_irqrestore(&chip->mixer_lock, flags); |
269 | #ifdef REG_DEBUG | 269 | #ifdef REG_DEBUG |
270 | snd_printk("Mixer reg %02x set to %02x\n", reg, val); | 270 | snd_printk(KERN_DEBUG "Mixer reg %02x set to %02x\n", reg, val); |
271 | #endif | 271 | #endif |
272 | } | 272 | } |
273 | 273 | ||
@@ -283,7 +283,7 @@ static int snd_es1938_mixer_read(es1938_t *chip, unsigned char reg) | |||
283 | data = inb(SLSB_REG(chip, MIXERDATA)); | 283 | data = inb(SLSB_REG(chip, MIXERDATA)); |
284 | spin_unlock_irqrestore(&chip->mixer_lock, flags); | 284 | spin_unlock_irqrestore(&chip->mixer_lock, flags); |
285 | #ifdef REG_DEBUG | 285 | #ifdef REG_DEBUG |
286 | snd_printk("Mixer reg %02x now is %02x\n", reg, data); | 286 | snd_printk(KERN_DEBUG "Mixer reg %02x now is %02x\n", reg, data); |
287 | #endif | 287 | #endif |
288 | return data; | 288 | return data; |
289 | } | 289 | } |
@@ -303,7 +303,8 @@ static int snd_es1938_mixer_bits(es1938_t *chip, unsigned char reg, unsigned cha | |||
303 | new = (old & ~mask) | (val & mask); | 303 | new = (old & ~mask) | (val & mask); |
304 | outb(new, SLSB_REG(chip, MIXERDATA)); | 304 | outb(new, SLSB_REG(chip, MIXERDATA)); |
305 | #ifdef REG_DEBUG | 305 | #ifdef REG_DEBUG |
306 | snd_printk("Mixer reg %02x was %02x, set to %02x\n", reg, old, new); | 306 | snd_printk(KERN_DEBUG "Mixer reg %02x was %02x, set to %02x\n", |
307 | reg, old, new); | ||
307 | #endif | 308 | #endif |
308 | } | 309 | } |
309 | spin_unlock_irqrestore(&chip->mixer_lock, flags); | 310 | spin_unlock_irqrestore(&chip->mixer_lock, flags); |
@@ -323,7 +324,7 @@ static void snd_es1938_write_cmd(es1938_t *chip, unsigned char cmd) | |||
323 | return; | 324 | return; |
324 | } | 325 | } |
325 | } | 326 | } |
326 | printk("snd_es1938_write_cmd timeout (0x02%x/0x02%x)\n", cmd, v); | 327 | printk(KERN_ERR "snd_es1938_write_cmd timeout (0x02%x/0x02%x)\n", cmd, v); |
327 | } | 328 | } |
328 | 329 | ||
329 | /* ----------------------------------------------------------------- | 330 | /* ----------------------------------------------------------------- |
@@ -336,7 +337,7 @@ static int snd_es1938_get_byte(es1938_t *chip) | |||
336 | for (i = GET_LOOP_TIMEOUT; i; i--) | 337 | for (i = GET_LOOP_TIMEOUT; i; i--) |
337 | if ((v = inb(SLSB_REG(chip, STATUS))) & 0x80) | 338 | if ((v = inb(SLSB_REG(chip, STATUS))) & 0x80) |
338 | return inb(SLSB_REG(chip, READDATA)); | 339 | return inb(SLSB_REG(chip, READDATA)); |
339 | snd_printk("get_byte timeout: status 0x02%x\n", v); | 340 | snd_printk(KERN_ERR "get_byte timeout: status 0x02%x\n", v); |
340 | return -ENODEV; | 341 | return -ENODEV; |
341 | } | 342 | } |
342 | 343 | ||
@@ -351,7 +352,7 @@ static void snd_es1938_write(es1938_t *chip, unsigned char reg, unsigned char va | |||
351 | snd_es1938_write_cmd(chip, val); | 352 | snd_es1938_write_cmd(chip, val); |
352 | spin_unlock_irqrestore(&chip->reg_lock, flags); | 353 | spin_unlock_irqrestore(&chip->reg_lock, flags); |
353 | #ifdef REG_DEBUG | 354 | #ifdef REG_DEBUG |
354 | snd_printk("Reg %02x set to %02x\n", reg, val); | 355 | snd_printk(KERN_DEBUG "Reg %02x set to %02x\n", reg, val); |
355 | #endif | 356 | #endif |
356 | } | 357 | } |
357 | 358 | ||
@@ -368,7 +369,7 @@ static unsigned char snd_es1938_read(es1938_t *chip, unsigned char reg) | |||
368 | val = snd_es1938_get_byte(chip); | 369 | val = snd_es1938_get_byte(chip); |
369 | spin_unlock_irqrestore(&chip->reg_lock, flags); | 370 | spin_unlock_irqrestore(&chip->reg_lock, flags); |
370 | #ifdef REG_DEBUG | 371 | #ifdef REG_DEBUG |
371 | snd_printk("Reg %02x now is %02x\n", reg, val); | 372 | snd_printk(KERN_DEBUG "Reg %02x now is %02x\n", reg, val); |
372 | #endif | 373 | #endif |
373 | return val; | 374 | return val; |
374 | } | 375 | } |
@@ -390,7 +391,8 @@ static int snd_es1938_bits(es1938_t *chip, unsigned char reg, unsigned char mask | |||
390 | new = (old & ~mask) | (val & mask); | 391 | new = (old & ~mask) | (val & mask); |
391 | snd_es1938_write_cmd(chip, new); | 392 | snd_es1938_write_cmd(chip, new); |
392 | #ifdef REG_DEBUG | 393 | #ifdef REG_DEBUG |
393 | snd_printk("Reg %02x was %02x, set to %02x\n", reg, old, new); | 394 | snd_printk(KERN_DEBUG "Reg %02x was %02x, set to %02x\n", |
395 | reg, old, new); | ||
394 | #endif | 396 | #endif |
395 | } | 397 | } |
396 | spin_unlock_irqrestore(&chip->reg_lock, flags); | 398 | spin_unlock_irqrestore(&chip->reg_lock, flags); |
@@ -413,7 +415,7 @@ static void snd_es1938_reset(es1938_t *chip) | |||
413 | goto __next; | 415 | goto __next; |
414 | } | 416 | } |
415 | } | 417 | } |
416 | snd_printk("ESS Solo-1 reset failed\n"); | 418 | snd_printk(KERN_ERR "ESS Solo-1 reset failed\n"); |
417 | 419 | ||
418 | __next: | 420 | __next: |
419 | snd_es1938_write_cmd(chip, ESS_CMD_ENABLEEXT); | 421 | snd_es1938_write_cmd(chip, ESS_CMD_ENABLEEXT); |
@@ -1499,7 +1501,7 @@ static int __devinit snd_es1938_create(snd_card_t * card, | |||
1499 | /* check, if we can restrict PCI DMA transfers to 24 bits */ | 1501 | /* check, if we can restrict PCI DMA transfers to 24 bits */ |
1500 | if (pci_set_dma_mask(pci, 0x00ffffff) < 0 || | 1502 | if (pci_set_dma_mask(pci, 0x00ffffff) < 0 || |
1501 | pci_set_consistent_dma_mask(pci, 0x00ffffff) < 0) { | 1503 | pci_set_consistent_dma_mask(pci, 0x00ffffff) < 0) { |
1502 | snd_printk("architecture does not support 24bit PCI busmaster DMA\n"); | 1504 | snd_printk(KERN_ERR "architecture does not support 24bit PCI busmaster DMA\n"); |
1503 | pci_disable_device(pci); | 1505 | pci_disable_device(pci); |
1504 | return -ENXIO; | 1506 | return -ENXIO; |
1505 | } | 1507 | } |
@@ -1524,13 +1526,13 @@ static int __devinit snd_es1938_create(snd_card_t * card, | |||
1524 | chip->mpu_port = pci_resource_start(pci, 3); | 1526 | chip->mpu_port = pci_resource_start(pci, 3); |
1525 | chip->game_port = pci_resource_start(pci, 4); | 1527 | chip->game_port = pci_resource_start(pci, 4); |
1526 | if (request_irq(pci->irq, snd_es1938_interrupt, SA_INTERRUPT|SA_SHIRQ, "ES1938", (void *)chip)) { | 1528 | if (request_irq(pci->irq, snd_es1938_interrupt, SA_INTERRUPT|SA_SHIRQ, "ES1938", (void *)chip)) { |
1527 | snd_printk("unable to grab IRQ %d\n", pci->irq); | 1529 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
1528 | snd_es1938_free(chip); | 1530 | snd_es1938_free(chip); |
1529 | return -EBUSY; | 1531 | return -EBUSY; |
1530 | } | 1532 | } |
1531 | chip->irq = pci->irq; | 1533 | chip->irq = pci->irq; |
1532 | #ifdef ES1938_DDEBUG | 1534 | #ifdef ES1938_DDEBUG |
1533 | snd_printk("create: io: 0x%lx, sb: 0x%lx, vc: 0x%lx, mpu: 0x%lx, game: 0x%lx\n", | 1535 | snd_printk(KERN_DEBUG "create: io: 0x%lx, sb: 0x%lx, vc: 0x%lx, mpu: 0x%lx, game: 0x%lx\n", |
1534 | chip->io_port, chip->sb_port, chip->vc_port, chip->mpu_port, chip->game_port); | 1536 | chip->io_port, chip->sb_port, chip->vc_port, chip->mpu_port, chip->game_port); |
1535 | #endif | 1537 | #endif |
1536 | 1538 | ||
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c index 1bf094b67469..ac8294e21cc1 100644 --- a/sound/pci/es1968.c +++ b/sound/pci/es1968.c | |||
@@ -1462,13 +1462,13 @@ snd_es1968_init_dmabuf(es1968_t *chip) | |||
1462 | snd_dma_pci_data(chip->pci), | 1462 | snd_dma_pci_data(chip->pci), |
1463 | chip->total_bufsize, &chip->dma); | 1463 | chip->total_bufsize, &chip->dma); |
1464 | if (err < 0 || ! chip->dma.area) { | 1464 | if (err < 0 || ! chip->dma.area) { |
1465 | snd_printk("es1968: can't allocate dma pages for size %d\n", | 1465 | snd_printk(KERN_ERR "es1968: can't allocate dma pages for size %d\n", |
1466 | chip->total_bufsize); | 1466 | chip->total_bufsize); |
1467 | return -ENOMEM; | 1467 | return -ENOMEM; |
1468 | } | 1468 | } |
1469 | if ((chip->dma.addr + chip->dma.bytes - 1) & ~((1 << 28) - 1)) { | 1469 | if ((chip->dma.addr + chip->dma.bytes - 1) & ~((1 << 28) - 1)) { |
1470 | snd_dma_free_pages(&chip->dma); | 1470 | snd_dma_free_pages(&chip->dma); |
1471 | snd_printk("es1968: DMA buffer beyond 256MB.\n"); | 1471 | snd_printk(KERN_ERR "es1968: DMA buffer beyond 256MB.\n"); |
1472 | return -ENOMEM; | 1472 | return -ENOMEM; |
1473 | } | 1473 | } |
1474 | } | 1474 | } |
@@ -1741,11 +1741,11 @@ static void __devinit es1968_measure_clock(es1968_t *chip) | |||
1741 | 1741 | ||
1742 | /* search 2 APUs (although one apu is enough) */ | 1742 | /* search 2 APUs (although one apu is enough) */ |
1743 | if ((apu = snd_es1968_alloc_apu_pair(chip, ESM_APU_PCM_PLAY)) < 0) { | 1743 | if ((apu = snd_es1968_alloc_apu_pair(chip, ESM_APU_PCM_PLAY)) < 0) { |
1744 | snd_printk("Hmm, cannot find empty APU pair!?\n"); | 1744 | snd_printk(KERN_ERR "Hmm, cannot find empty APU pair!?\n"); |
1745 | return; | 1745 | return; |
1746 | } | 1746 | } |
1747 | if ((memory = snd_es1968_new_memory(chip, CLOCK_MEASURE_BUFSIZE)) == NULL) { | 1747 | if ((memory = snd_es1968_new_memory(chip, CLOCK_MEASURE_BUFSIZE)) == NULL) { |
1748 | snd_printk("cannot allocate dma buffer - using default clock %d\n", chip->clock); | 1748 | snd_printk(KERN_ERR "cannot allocate dma buffer - using default clock %d\n", chip->clock); |
1749 | snd_es1968_free_apu_pair(chip, apu); | 1749 | snd_es1968_free_apu_pair(chip, apu); |
1750 | return; | 1750 | return; |
1751 | } | 1751 | } |
@@ -1806,7 +1806,7 @@ static void __devinit es1968_measure_clock(es1968_t *chip) | |||
1806 | else | 1806 | else |
1807 | t += stop_time.tv_usec - start_time.tv_usec; | 1807 | t += stop_time.tv_usec - start_time.tv_usec; |
1808 | if (t == 0) { | 1808 | if (t == 0) { |
1809 | snd_printk("?? calculation error..\n"); | 1809 | snd_printk(KERN_ERR "?? calculation error..\n"); |
1810 | } else { | 1810 | } else { |
1811 | offset *= 1000; | 1811 | offset *= 1000; |
1812 | offset = (offset / t) * 1000 + ((offset % t) * 1000) / t; | 1812 | offset = (offset / t) * 1000 + ((offset % t) * 1000) / t; |
@@ -2090,7 +2090,7 @@ static void snd_es1968_ac97_reset(es1968_t *chip) | |||
2090 | outw(inw(ioaddr + 0x3c) & 0xfffc, ioaddr + 0x3c); | 2090 | outw(inw(ioaddr + 0x3c) & 0xfffc, ioaddr + 0x3c); |
2091 | 2091 | ||
2092 | #if 0 /* the loop here needs to be much better if we want it.. */ | 2092 | #if 0 /* the loop here needs to be much better if we want it.. */ |
2093 | snd_printk("trying software reset\n"); | 2093 | snd_printk(KERN_INFO "trying software reset\n"); |
2094 | /* try and do a software reset */ | 2094 | /* try and do a software reset */ |
2095 | outb(0x80 | 0x7c, ioaddr + 0x30); | 2095 | outb(0x80 | 0x7c, ioaddr + 0x30); |
2096 | for (w = 0;; w++) { | 2096 | for (w = 0;; w++) { |
@@ -2562,7 +2562,7 @@ static int __devinit snd_es1968_create(snd_card_t * card, | |||
2562 | /* check, if we can restrict PCI DMA transfers to 28 bits */ | 2562 | /* check, if we can restrict PCI DMA transfers to 28 bits */ |
2563 | if (pci_set_dma_mask(pci, 0x0fffffff) < 0 || | 2563 | if (pci_set_dma_mask(pci, 0x0fffffff) < 0 || |
2564 | pci_set_consistent_dma_mask(pci, 0x0fffffff) < 0) { | 2564 | pci_set_consistent_dma_mask(pci, 0x0fffffff) < 0) { |
2565 | snd_printk("architecture does not support 28bit PCI busmaster DMA\n"); | 2565 | snd_printk(KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n"); |
2566 | pci_disable_device(pci); | 2566 | pci_disable_device(pci); |
2567 | return -ENXIO; | 2567 | return -ENXIO; |
2568 | } | 2568 | } |
@@ -2597,7 +2597,7 @@ static int __devinit snd_es1968_create(snd_card_t * card, | |||
2597 | chip->io_port = pci_resource_start(pci, 0); | 2597 | chip->io_port = pci_resource_start(pci, 0); |
2598 | if (request_irq(pci->irq, snd_es1968_interrupt, SA_INTERRUPT|SA_SHIRQ, | 2598 | if (request_irq(pci->irq, snd_es1968_interrupt, SA_INTERRUPT|SA_SHIRQ, |
2599 | "ESS Maestro", (void*)chip)) { | 2599 | "ESS Maestro", (void*)chip)) { |
2600 | snd_printk("unable to grab IRQ %d\n", pci->irq); | 2600 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
2601 | snd_es1968_free(chip); | 2601 | snd_es1968_free(chip); |
2602 | return -EBUSY; | 2602 | return -EBUSY; |
2603 | } | 2603 | } |
diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c index e5cfa2a0c246..47dbe317069f 100644 --- a/sound/pci/fm801.c +++ b/sound/pci/fm801.c | |||
@@ -237,7 +237,7 @@ static void snd_fm801_codec_write(ac97_t *ac97, | |||
237 | goto ok1; | 237 | goto ok1; |
238 | udelay(10); | 238 | udelay(10); |
239 | } | 239 | } |
240 | snd_printk("AC'97 interface is busy (1)\n"); | 240 | snd_printk(KERN_ERR "AC'97 interface is busy (1)\n"); |
241 | return; | 241 | return; |
242 | 242 | ||
243 | ok1: | 243 | ok1: |
@@ -252,7 +252,7 @@ static void snd_fm801_codec_write(ac97_t *ac97, | |||
252 | return; | 252 | return; |
253 | udelay(10); | 253 | udelay(10); |
254 | } | 254 | } |
255 | snd_printk("AC'97 interface #%d is busy (2)\n", ac97->num); | 255 | snd_printk(KERN_ERR "AC'97 interface #%d is busy (2)\n", ac97->num); |
256 | } | 256 | } |
257 | 257 | ||
258 | static unsigned short snd_fm801_codec_read(ac97_t *ac97, unsigned short reg) | 258 | static unsigned short snd_fm801_codec_read(ac97_t *ac97, unsigned short reg) |
@@ -268,7 +268,7 @@ static unsigned short snd_fm801_codec_read(ac97_t *ac97, unsigned short reg) | |||
268 | goto ok1; | 268 | goto ok1; |
269 | udelay(10); | 269 | udelay(10); |
270 | } | 270 | } |
271 | snd_printk("AC'97 interface is busy (1)\n"); | 271 | snd_printk(KERN_ERR "AC'97 interface is busy (1)\n"); |
272 | return 0; | 272 | return 0; |
273 | 273 | ||
274 | ok1: | 274 | ok1: |
@@ -279,7 +279,7 @@ static unsigned short snd_fm801_codec_read(ac97_t *ac97, unsigned short reg) | |||
279 | goto ok2; | 279 | goto ok2; |
280 | udelay(10); | 280 | udelay(10); |
281 | } | 281 | } |
282 | snd_printk("AC'97 interface #%d is busy (2)\n", ac97->num); | 282 | snd_printk(KERN_ERR "AC'97 interface #%d is busy (2)\n", ac97->num); |
283 | return 0; | 283 | return 0; |
284 | 284 | ||
285 | ok2: | 285 | ok2: |
@@ -288,7 +288,7 @@ static unsigned short snd_fm801_codec_read(ac97_t *ac97, unsigned short reg) | |||
288 | goto ok3; | 288 | goto ok3; |
289 | udelay(10); | 289 | udelay(10); |
290 | } | 290 | } |
291 | snd_printk("AC'97 interface #%d is not valid (2)\n", ac97->num); | 291 | snd_printk(KERN_ERR "AC'97 interface #%d is not valid (2)\n", ac97->num); |
292 | return 0; | 292 | return 0; |
293 | 293 | ||
294 | ok3: | 294 | ok3: |
@@ -1279,7 +1279,7 @@ static int __devinit snd_fm801_create(snd_card_t * card, | |||
1279 | } | 1279 | } |
1280 | chip->port = pci_resource_start(pci, 0); | 1280 | chip->port = pci_resource_start(pci, 0); |
1281 | if (request_irq(pci->irq, snd_fm801_interrupt, SA_INTERRUPT|SA_SHIRQ, "FM801", (void *)chip)) { | 1281 | if (request_irq(pci->irq, snd_fm801_interrupt, SA_INTERRUPT|SA_SHIRQ, "FM801", (void *)chip)) { |
1282 | snd_printk("unable to grab IRQ %d\n", chip->irq); | 1282 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", chip->irq); |
1283 | snd_fm801_free(chip); | 1283 | snd_fm801_free(chip); |
1284 | return -EBUSY; | 1284 | return -EBUSY; |
1285 | } | 1285 | } |
@@ -1306,7 +1306,7 @@ static int __devinit snd_fm801_create(snd_card_t * card, | |||
1306 | set_current_state(TASK_UNINTERRUPTIBLE); | 1306 | set_current_state(TASK_UNINTERRUPTIBLE); |
1307 | schedule_timeout(1); | 1307 | schedule_timeout(1); |
1308 | } while (time_after(timeout, jiffies)); | 1308 | } while (time_after(timeout, jiffies)); |
1309 | snd_printk("Primary AC'97 codec not found\n"); | 1309 | snd_printk(KERN_ERR "Primary AC'97 codec not found\n"); |
1310 | snd_fm801_free(chip); | 1310 | snd_fm801_free(chip); |
1311 | return -EIO; | 1311 | return -EIO; |
1312 | 1312 | ||
@@ -1346,7 +1346,7 @@ static int __devinit snd_fm801_create(snd_card_t * card, | |||
1346 | set_current_state(TASK_UNINTERRUPTIBLE); | 1346 | set_current_state(TASK_UNINTERRUPTIBLE); |
1347 | schedule_timeout(1); | 1347 | schedule_timeout(1); |
1348 | } while (time_after(timeout, jiffies)); | 1348 | } while (time_after(timeout, jiffies)); |
1349 | snd_printk("Primary AC'97 codec not responding\n"); | 1349 | snd_printk(KERN_ERR "Primary AC'97 codec not responding\n"); |
1350 | snd_fm801_free(chip); | 1350 | snd_fm801_free(chip); |
1351 | return -EIO; | 1351 | return -EIO; |
1352 | 1352 | ||
diff --git a/sound/pci/ice1712/aureon.c b/sound/pci/ice1712/aureon.c index 2e0a31613ee6..40b48186767e 100644 --- a/sound/pci/ice1712/aureon.c +++ b/sound/pci/ice1712/aureon.c | |||
@@ -1672,9 +1672,9 @@ static int __devinit aureon_add_controls(ice1712_t *ice) | |||
1672 | snd_ice1712_save_gpio_status(ice); | 1672 | snd_ice1712_save_gpio_status(ice); |
1673 | id = aureon_cs8415_get(ice, CS8415_ID); | 1673 | id = aureon_cs8415_get(ice, CS8415_ID); |
1674 | if (id != 0x41) | 1674 | if (id != 0x41) |
1675 | snd_printk("No CS8415 chip. Skipping CS8415 controls.\n"); | 1675 | snd_printk(KERN_INFO "No CS8415 chip. Skipping CS8415 controls.\n"); |
1676 | else if ((id & 0x0F) != 0x01) | 1676 | else if ((id & 0x0F) != 0x01) |
1677 | snd_printk("Detected unsupported CS8415 rev. (%c)\n", (char)((id & 0x0F) + 'A' - 1)); | 1677 | snd_printk(KERN_INFO "Detected unsupported CS8415 rev. (%c)\n", (char)((id & 0x0F) + 'A' - 1)); |
1678 | else { | 1678 | else { |
1679 | for (i = 0; i< ARRAY_SIZE(cs8415_controls); i++) { | 1679 | for (i = 0; i< ARRAY_SIZE(cs8415_controls); i++) { |
1680 | snd_kcontrol_t *kctl; | 1680 | snd_kcontrol_t *kctl; |
diff --git a/sound/pci/ice1712/delta.c b/sound/pci/ice1712/delta.c index 39fbe662965d..576f69d482c9 100644 --- a/sound/pci/ice1712/delta.c +++ b/sound/pci/ice1712/delta.c | |||
@@ -546,7 +546,7 @@ static int __devinit snd_ice1712_delta_init(ice1712_t *ice) | |||
546 | case ICE1712_SUBDEVICE_DELTA1010LT: | 546 | case ICE1712_SUBDEVICE_DELTA1010LT: |
547 | case ICE1712_SUBDEVICE_VX442: | 547 | case ICE1712_SUBDEVICE_VX442: |
548 | if ((err = snd_i2c_bus_create(ice->card, "ICE1712 GPIO 1", NULL, &ice->i2c)) < 0) { | 548 | if ((err = snd_i2c_bus_create(ice->card, "ICE1712 GPIO 1", NULL, &ice->i2c)) < 0) { |
549 | snd_printk("unable to create I2C bus\n"); | 549 | snd_printk(KERN_ERR "unable to create I2C bus\n"); |
550 | return err; | 550 | return err; |
551 | } | 551 | } |
552 | ice->i2c->private_data = ice; | 552 | ice->i2c->private_data = ice; |
diff --git a/sound/pci/ice1712/ews.c b/sound/pci/ice1712/ews.c index e36efa1bdac3..c8ec5cac3c17 100644 --- a/sound/pci/ice1712/ews.c +++ b/sound/pci/ice1712/ews.c | |||
@@ -438,7 +438,7 @@ static int __devinit snd_ice1712_ews_init(ice1712_t *ice) | |||
438 | 438 | ||
439 | /* create i2c */ | 439 | /* create i2c */ |
440 | if ((err = snd_i2c_bus_create(ice->card, "ICE1712 GPIO 1", NULL, &ice->i2c)) < 0) { | 440 | if ((err = snd_i2c_bus_create(ice->card, "ICE1712 GPIO 1", NULL, &ice->i2c)) < 0) { |
441 | snd_printk("unable to create I2C bus\n"); | 441 | snd_printk(KERN_ERR "unable to create I2C bus\n"); |
442 | return err; | 442 | return err; |
443 | } | 443 | } |
444 | ice->i2c->private_data = ice; | 444 | ice->i2c->private_data = ice; |
@@ -448,7 +448,7 @@ static int __devinit snd_ice1712_ews_init(ice1712_t *ice) | |||
448 | switch (ice->eeprom.subvendor) { | 448 | switch (ice->eeprom.subvendor) { |
449 | case ICE1712_SUBDEVICE_DMX6FIRE: | 449 | case ICE1712_SUBDEVICE_DMX6FIRE: |
450 | if ((err = snd_i2c_device_create(ice->i2c, "PCF9554", ICE1712_6FIRE_PCF9554_ADDR, &ice->spec.i2cdevs[EWS_I2C_6FIRE])) < 0) { | 450 | if ((err = snd_i2c_device_create(ice->i2c, "PCF9554", ICE1712_6FIRE_PCF9554_ADDR, &ice->spec.i2cdevs[EWS_I2C_6FIRE])) < 0) { |
451 | snd_printk("PCF9554 initialization failed\n"); | 451 | snd_printk(KERN_ERR "PCF9554 initialization failed\n"); |
452 | return err; | 452 | return err; |
453 | } | 453 | } |
454 | snd_ice1712_6fire_write_pca(ice, PCF9554_REG_CONFIG, 0x80); | 454 | snd_ice1712_6fire_write_pca(ice, PCF9554_REG_CONFIG, 0x80); |
@@ -791,7 +791,7 @@ static int snd_ice1712_6fire_read_pca(ice1712_t *ice, unsigned char reg) | |||
791 | byte = 0; | 791 | byte = 0; |
792 | if (snd_i2c_readbytes(ice->spec.i2cdevs[EWS_I2C_6FIRE], &byte, 1) != 1) { | 792 | if (snd_i2c_readbytes(ice->spec.i2cdevs[EWS_I2C_6FIRE], &byte, 1) != 1) { |
793 | snd_i2c_unlock(ice->i2c); | 793 | snd_i2c_unlock(ice->i2c); |
794 | printk("cannot read pca\n"); | 794 | printk(KERN_ERR "cannot read pca\n"); |
795 | return -EIO; | 795 | return -EIO; |
796 | } | 796 | } |
797 | snd_i2c_unlock(ice->i2c); | 797 | snd_i2c_unlock(ice->i2c); |
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c index a6d98013c331..5aca37798c32 100644 --- a/sound/pci/ice1712/ice1712.c +++ b/sound/pci/ice1712/ice1712.c | |||
@@ -387,7 +387,7 @@ int __devinit snd_ice1712_init_cs8427(ice1712_t *ice, int addr) | |||
387 | if ((err = snd_cs8427_create(ice->i2c, addr, | 387 | if ((err = snd_cs8427_create(ice->i2c, addr, |
388 | (ice->cs8427_timeout * HZ) / 1000, | 388 | (ice->cs8427_timeout * HZ) / 1000, |
389 | &ice->cs8427)) < 0) { | 389 | &ice->cs8427)) < 0) { |
390 | snd_printk("CS8427 initialization failed\n"); | 390 | snd_printk(KERN_ERR "CS8427 initialization failed\n"); |
391 | return err; | 391 | return err; |
392 | } | 392 | } |
393 | ice->spdif.ops.open = open_cs8427; | 393 | ice->spdif.ops.open = open_cs8427; |
@@ -2348,12 +2348,12 @@ static int __devinit snd_ice1712_read_eeprom(ice1712_t *ice, const char *modelna | |||
2348 | if (ice->eeprom.size < 6) | 2348 | if (ice->eeprom.size < 6) |
2349 | ice->eeprom.size = 32; /* FIXME: any cards without the correct size? */ | 2349 | ice->eeprom.size = 32; /* FIXME: any cards without the correct size? */ |
2350 | else if (ice->eeprom.size > 32) { | 2350 | else if (ice->eeprom.size > 32) { |
2351 | snd_printk("invalid EEPROM (size = %i)\n", ice->eeprom.size); | 2351 | snd_printk(KERN_ERR "invalid EEPROM (size = %i)\n", ice->eeprom.size); |
2352 | return -EIO; | 2352 | return -EIO; |
2353 | } | 2353 | } |
2354 | ice->eeprom.version = snd_ice1712_read_i2c(ice, dev, 0x05); | 2354 | ice->eeprom.version = snd_ice1712_read_i2c(ice, dev, 0x05); |
2355 | if (ice->eeprom.version != 1) { | 2355 | if (ice->eeprom.version != 1) { |
2356 | snd_printk("invalid EEPROM version %i\n", ice->eeprom.version); | 2356 | snd_printk(KERN_ERR "invalid EEPROM version %i\n", ice->eeprom.version); |
2357 | /* return -EIO; */ | 2357 | /* return -EIO; */ |
2358 | } | 2358 | } |
2359 | size = ice->eeprom.size - 6; | 2359 | size = ice->eeprom.size - 6; |
@@ -2524,7 +2524,7 @@ static int __devinit snd_ice1712_create(snd_card_t * card, | |||
2524 | /* check, if we can restrict PCI DMA transfers to 28 bits */ | 2524 | /* check, if we can restrict PCI DMA transfers to 28 bits */ |
2525 | if (pci_set_dma_mask(pci, 0x0fffffff) < 0 || | 2525 | if (pci_set_dma_mask(pci, 0x0fffffff) < 0 || |
2526 | pci_set_consistent_dma_mask(pci, 0x0fffffff) < 0) { | 2526 | pci_set_consistent_dma_mask(pci, 0x0fffffff) < 0) { |
2527 | snd_printk("architecture does not support 28bit PCI busmaster DMA\n"); | 2527 | snd_printk(KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n"); |
2528 | pci_disable_device(pci); | 2528 | pci_disable_device(pci); |
2529 | return -ENXIO; | 2529 | return -ENXIO; |
2530 | } | 2530 | } |
@@ -2573,7 +2573,7 @@ static int __devinit snd_ice1712_create(snd_card_t * card, | |||
2573 | ice->profi_port = pci_resource_start(pci, 3); | 2573 | ice->profi_port = pci_resource_start(pci, 3); |
2574 | 2574 | ||
2575 | if (request_irq(pci->irq, snd_ice1712_interrupt, SA_INTERRUPT|SA_SHIRQ, "ICE1712", (void *) ice)) { | 2575 | if (request_irq(pci->irq, snd_ice1712_interrupt, SA_INTERRUPT|SA_SHIRQ, "ICE1712", (void *) ice)) { |
2576 | snd_printk("unable to grab IRQ %d\n", pci->irq); | 2576 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
2577 | snd_ice1712_free(ice); | 2577 | snd_ice1712_free(ice); |
2578 | return -EIO; | 2578 | return -EIO; |
2579 | } | 2579 | } |
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c index a1133c53412f..5b4293f5a652 100644 --- a/sound/pci/ice1712/ice1724.c +++ b/sound/pci/ice1712/ice1724.c | |||
@@ -2171,7 +2171,7 @@ static int __devinit snd_vt1724_create(snd_card_t * card, | |||
2171 | ice->profi_port = pci_resource_start(pci, 1); | 2171 | ice->profi_port = pci_resource_start(pci, 1); |
2172 | 2172 | ||
2173 | if (request_irq(pci->irq, snd_vt1724_interrupt, SA_INTERRUPT|SA_SHIRQ, "ICE1724", (void *) ice)) { | 2173 | if (request_irq(pci->irq, snd_vt1724_interrupt, SA_INTERRUPT|SA_SHIRQ, "ICE1724", (void *) ice)) { |
2174 | snd_printk("unable to grab IRQ %d\n", pci->irq); | 2174 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
2175 | snd_vt1724_free(ice); | 2175 | snd_vt1724_free(ice); |
2176 | return -EIO; | 2176 | return -EIO; |
2177 | } | 2177 | } |
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c index 68d0ed033d3a..d71f5d1e7169 100644 --- a/sound/pci/intel8x0.c +++ b/sound/pci/intel8x0.c | |||
@@ -538,7 +538,7 @@ static int snd_intel8x0_codec_semaphore(intel8x0_t *chip, unsigned int codec) | |||
538 | /* access to some forbidden (non existant) ac97 registers will not | 538 | /* access to some forbidden (non existant) ac97 registers will not |
539 | * reset the semaphore. So even if you don't get the semaphore, still | 539 | * reset the semaphore. So even if you don't get the semaphore, still |
540 | * continue the access. We don't need the semaphore anyway. */ | 540 | * continue the access. We don't need the semaphore anyway. */ |
541 | snd_printk("codec_semaphore: semaphore is not ready [0x%x][0x%x]\n", | 541 | snd_printk(KERN_ERR "codec_semaphore: semaphore is not ready [0x%x][0x%x]\n", |
542 | igetbyte(chip, ICHREG(ACC_SEMA)), igetdword(chip, ICHREG(GLOB_STA))); | 542 | igetbyte(chip, ICHREG(ACC_SEMA)), igetdword(chip, ICHREG(GLOB_STA))); |
543 | iagetword(chip, 0); /* clear semaphore flag */ | 543 | iagetword(chip, 0); /* clear semaphore flag */ |
544 | /* I don't care about the semaphore */ | 544 | /* I don't care about the semaphore */ |
@@ -553,7 +553,7 @@ static void snd_intel8x0_codec_write(ac97_t *ac97, | |||
553 | 553 | ||
554 | if (snd_intel8x0_codec_semaphore(chip, ac97->num) < 0) { | 554 | if (snd_intel8x0_codec_semaphore(chip, ac97->num) < 0) { |
555 | if (! chip->in_ac97_init) | 555 | if (! chip->in_ac97_init) |
556 | snd_printk("codec_write %d: semaphore is not ready for register 0x%x\n", ac97->num, reg); | 556 | snd_printk(KERN_ERR "codec_write %d: semaphore is not ready for register 0x%x\n", ac97->num, reg); |
557 | } | 557 | } |
558 | iaputword(chip, reg + ac97->num * 0x80, val); | 558 | iaputword(chip, reg + ac97->num * 0x80, val); |
559 | } | 559 | } |
@@ -567,7 +567,7 @@ static unsigned short snd_intel8x0_codec_read(ac97_t *ac97, | |||
567 | 567 | ||
568 | if (snd_intel8x0_codec_semaphore(chip, ac97->num) < 0) { | 568 | if (snd_intel8x0_codec_semaphore(chip, ac97->num) < 0) { |
569 | if (! chip->in_ac97_init) | 569 | if (! chip->in_ac97_init) |
570 | snd_printk("codec_read %d: semaphore is not ready for register 0x%x\n", ac97->num, reg); | 570 | snd_printk(KERN_ERR "codec_read %d: semaphore is not ready for register 0x%x\n", ac97->num, reg); |
571 | res = 0xffff; | 571 | res = 0xffff; |
572 | } else { | 572 | } else { |
573 | res = iagetword(chip, reg + ac97->num * 0x80); | 573 | res = iagetword(chip, reg + ac97->num * 0x80); |
@@ -575,7 +575,7 @@ static unsigned short snd_intel8x0_codec_read(ac97_t *ac97, | |||
575 | /* reset RCS and preserve other R/WC bits */ | 575 | /* reset RCS and preserve other R/WC bits */ |
576 | iputdword(chip, ICHREG(GLOB_STA), tmp & ~(ICH_SRI|ICH_PRI|ICH_TRI|ICH_GSCI)); | 576 | iputdword(chip, ICHREG(GLOB_STA), tmp & ~(ICH_SRI|ICH_PRI|ICH_TRI|ICH_GSCI)); |
577 | if (! chip->in_ac97_init) | 577 | if (! chip->in_ac97_init) |
578 | snd_printk("codec_read %d: read timeout for register 0x%x\n", ac97->num, reg); | 578 | snd_printk(KERN_ERR "codec_read %d: read timeout for register 0x%x\n", ac97->num, reg); |
579 | res = 0xffff; | 579 | res = 0xffff; |
580 | } | 580 | } |
581 | } | 581 | } |
@@ -2173,7 +2173,7 @@ static int snd_intel8x0_ich_chip_init(intel8x0_t *chip, int probing) | |||
2173 | goto __ok; | 2173 | goto __ok; |
2174 | do_delay(chip); | 2174 | do_delay(chip); |
2175 | } while (time_after_eq(end_time, jiffies)); | 2175 | } while (time_after_eq(end_time, jiffies)); |
2176 | snd_printk("AC'97 warm reset still in progress? [0x%x]\n", igetdword(chip, ICHREG(GLOB_CNT))); | 2176 | snd_printk(KERN_ERR "AC'97 warm reset still in progress? [0x%x]\n", igetdword(chip, ICHREG(GLOB_CNT))); |
2177 | return -EIO; | 2177 | return -EIO; |
2178 | 2178 | ||
2179 | __ok: | 2179 | __ok: |
@@ -2448,7 +2448,7 @@ static void __devinit intel8x0_measure_ac97_clock(intel8x0_t *chip) | |||
2448 | 2448 | ||
2449 | subs = chip->pcm[0]->streams[0].substream; | 2449 | subs = chip->pcm[0]->streams[0].substream; |
2450 | if (! subs || subs->dma_buffer.bytes < INTEL8X0_TESTBUF_SIZE) { | 2450 | if (! subs || subs->dma_buffer.bytes < INTEL8X0_TESTBUF_SIZE) { |
2451 | snd_printk("no playback buffer allocated - aborting measure ac97 clock\n"); | 2451 | snd_printk(KERN_WARNING "no playback buffer allocated - aborting measure ac97 clock\n"); |
2452 | return; | 2452 | return; |
2453 | } | 2453 | } |
2454 | ichdev = &chip->ichd[ICHD_PCMOUT]; | 2454 | ichdev = &chip->ichd[ICHD_PCMOUT]; |
@@ -2655,7 +2655,7 @@ static int __devinit snd_intel8x0_create(snd_card_t * card, | |||
2655 | chip->remap_addr = ioremap_nocache(chip->addr, | 2655 | chip->remap_addr = ioremap_nocache(chip->addr, |
2656 | pci_resource_len(pci, 2)); | 2656 | pci_resource_len(pci, 2)); |
2657 | if (chip->remap_addr == NULL) { | 2657 | if (chip->remap_addr == NULL) { |
2658 | snd_printk("AC'97 space ioremap problem\n"); | 2658 | snd_printk(KERN_ERR "AC'97 space ioremap problem\n"); |
2659 | snd_intel8x0_free(chip); | 2659 | snd_intel8x0_free(chip); |
2660 | return -EIO; | 2660 | return -EIO; |
2661 | } | 2661 | } |
@@ -2668,7 +2668,7 @@ static int __devinit snd_intel8x0_create(snd_card_t * card, | |||
2668 | chip->remap_bmaddr = ioremap_nocache(chip->bmaddr, | 2668 | chip->remap_bmaddr = ioremap_nocache(chip->bmaddr, |
2669 | pci_resource_len(pci, 3)); | 2669 | pci_resource_len(pci, 3)); |
2670 | if (chip->remap_bmaddr == NULL) { | 2670 | if (chip->remap_bmaddr == NULL) { |
2671 | snd_printk("Controller space ioremap problem\n"); | 2671 | snd_printk(KERN_ERR "Controller space ioremap problem\n"); |
2672 | snd_intel8x0_free(chip); | 2672 | snd_intel8x0_free(chip); |
2673 | return -EIO; | 2673 | return -EIO; |
2674 | } | 2674 | } |
@@ -2678,7 +2678,7 @@ static int __devinit snd_intel8x0_create(snd_card_t * card, | |||
2678 | 2678 | ||
2679 | port_inited: | 2679 | port_inited: |
2680 | if (request_irq(pci->irq, snd_intel8x0_interrupt, SA_INTERRUPT|SA_SHIRQ, card->shortname, (void *)chip)) { | 2680 | if (request_irq(pci->irq, snd_intel8x0_interrupt, SA_INTERRUPT|SA_SHIRQ, card->shortname, (void *)chip)) { |
2681 | snd_printk("unable to grab IRQ %d\n", pci->irq); | 2681 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
2682 | snd_intel8x0_free(chip); | 2682 | snd_intel8x0_free(chip); |
2683 | return -EBUSY; | 2683 | return -EBUSY; |
2684 | } | 2684 | } |
diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c index 42601f0e6a57..49a9f4d08963 100644 --- a/sound/pci/intel8x0m.c +++ b/sound/pci/intel8x0m.c | |||
@@ -363,7 +363,7 @@ static int snd_intel8x0m_codec_semaphore(intel8x0_t *chip, unsigned int codec) | |||
363 | /* access to some forbidden (non existant) ac97 registers will not | 363 | /* access to some forbidden (non existant) ac97 registers will not |
364 | * reset the semaphore. So even if you don't get the semaphore, still | 364 | * reset the semaphore. So even if you don't get the semaphore, still |
365 | * continue the access. We don't need the semaphore anyway. */ | 365 | * continue the access. We don't need the semaphore anyway. */ |
366 | snd_printk("codec_semaphore: semaphore is not ready [0x%x][0x%x]\n", | 366 | snd_printk(KERN_ERR "codec_semaphore: semaphore is not ready [0x%x][0x%x]\n", |
367 | igetbyte(chip, ICHREG(ACC_SEMA)), igetdword(chip, ICHREG(GLOB_STA))); | 367 | igetbyte(chip, ICHREG(ACC_SEMA)), igetdword(chip, ICHREG(GLOB_STA))); |
368 | iagetword(chip, 0); /* clear semaphore flag */ | 368 | iagetword(chip, 0); /* clear semaphore flag */ |
369 | /* I don't care about the semaphore */ | 369 | /* I don't care about the semaphore */ |
@@ -378,7 +378,7 @@ static void snd_intel8x0_codec_write(ac97_t *ac97, | |||
378 | 378 | ||
379 | if (snd_intel8x0m_codec_semaphore(chip, ac97->num) < 0) { | 379 | if (snd_intel8x0m_codec_semaphore(chip, ac97->num) < 0) { |
380 | if (! chip->in_ac97_init) | 380 | if (! chip->in_ac97_init) |
381 | snd_printk("codec_write %d: semaphore is not ready for register 0x%x\n", ac97->num, reg); | 381 | snd_printk(KERN_ERR "codec_write %d: semaphore is not ready for register 0x%x\n", ac97->num, reg); |
382 | } | 382 | } |
383 | iaputword(chip, reg + ac97->num * 0x80, val); | 383 | iaputword(chip, reg + ac97->num * 0x80, val); |
384 | } | 384 | } |
@@ -392,7 +392,7 @@ static unsigned short snd_intel8x0_codec_read(ac97_t *ac97, | |||
392 | 392 | ||
393 | if (snd_intel8x0m_codec_semaphore(chip, ac97->num) < 0) { | 393 | if (snd_intel8x0m_codec_semaphore(chip, ac97->num) < 0) { |
394 | if (! chip->in_ac97_init) | 394 | if (! chip->in_ac97_init) |
395 | snd_printk("codec_read %d: semaphore is not ready for register 0x%x\n", ac97->num, reg); | 395 | snd_printk(KERN_ERR "codec_read %d: semaphore is not ready for register 0x%x\n", ac97->num, reg); |
396 | res = 0xffff; | 396 | res = 0xffff; |
397 | } else { | 397 | } else { |
398 | res = iagetword(chip, reg + ac97->num * 0x80); | 398 | res = iagetword(chip, reg + ac97->num * 0x80); |
@@ -400,7 +400,7 @@ static unsigned short snd_intel8x0_codec_read(ac97_t *ac97, | |||
400 | /* reset RCS and preserve other R/WC bits */ | 400 | /* reset RCS and preserve other R/WC bits */ |
401 | iputdword(chip, ICHREG(GLOB_STA), tmp & ~(ICH_SRI|ICH_PRI|ICH_TRI|ICH_GSCI)); | 401 | iputdword(chip, ICHREG(GLOB_STA), tmp & ~(ICH_SRI|ICH_PRI|ICH_TRI|ICH_GSCI)); |
402 | if (! chip->in_ac97_init) | 402 | if (! chip->in_ac97_init) |
403 | snd_printk("codec_read %d: read timeout for register 0x%x\n", ac97->num, reg); | 403 | snd_printk(KERN_ERR "codec_read %d: read timeout for register 0x%x\n", ac97->num, reg); |
404 | res = 0xffff; | 404 | res = 0xffff; |
405 | } | 405 | } |
406 | } | 406 | } |
@@ -917,7 +917,7 @@ static int snd_intel8x0m_ich_chip_init(intel8x0_t *chip, int probing) | |||
917 | goto __ok; | 917 | goto __ok; |
918 | do_delay(chip); | 918 | do_delay(chip); |
919 | } while (time_after_eq(end_time, jiffies)); | 919 | } while (time_after_eq(end_time, jiffies)); |
920 | snd_printk("AC'97 warm reset still in progress? [0x%x]\n", igetdword(chip, ICHREG(GLOB_CNT))); | 920 | snd_printk(KERN_ERR "AC'97 warm reset still in progress? [0x%x]\n", igetdword(chip, ICHREG(GLOB_CNT))); |
921 | return -EIO; | 921 | return -EIO; |
922 | 922 | ||
923 | __ok: | 923 | __ok: |
@@ -1143,7 +1143,7 @@ static int __devinit snd_intel8x0m_create(snd_card_t * card, | |||
1143 | chip->remap_addr = ioremap_nocache(chip->addr, | 1143 | chip->remap_addr = ioremap_nocache(chip->addr, |
1144 | pci_resource_len(pci, 2)); | 1144 | pci_resource_len(pci, 2)); |
1145 | if (chip->remap_addr == NULL) { | 1145 | if (chip->remap_addr == NULL) { |
1146 | snd_printk("AC'97 space ioremap problem\n"); | 1146 | snd_printk(KERN_ERR "AC'97 space ioremap problem\n"); |
1147 | snd_intel8x0_free(chip); | 1147 | snd_intel8x0_free(chip); |
1148 | return -EIO; | 1148 | return -EIO; |
1149 | } | 1149 | } |
@@ -1156,7 +1156,7 @@ static int __devinit snd_intel8x0m_create(snd_card_t * card, | |||
1156 | chip->remap_bmaddr = ioremap_nocache(chip->bmaddr, | 1156 | chip->remap_bmaddr = ioremap_nocache(chip->bmaddr, |
1157 | pci_resource_len(pci, 3)); | 1157 | pci_resource_len(pci, 3)); |
1158 | if (chip->remap_bmaddr == NULL) { | 1158 | if (chip->remap_bmaddr == NULL) { |
1159 | snd_printk("Controller space ioremap problem\n"); | 1159 | snd_printk(KERN_ERR "Controller space ioremap problem\n"); |
1160 | snd_intel8x0_free(chip); | 1160 | snd_intel8x0_free(chip); |
1161 | return -EIO; | 1161 | return -EIO; |
1162 | } | 1162 | } |
@@ -1166,7 +1166,7 @@ static int __devinit snd_intel8x0m_create(snd_card_t * card, | |||
1166 | 1166 | ||
1167 | port_inited: | 1167 | port_inited: |
1168 | if (request_irq(pci->irq, snd_intel8x0_interrupt, SA_INTERRUPT|SA_SHIRQ, card->shortname, (void *)chip)) { | 1168 | if (request_irq(pci->irq, snd_intel8x0_interrupt, SA_INTERRUPT|SA_SHIRQ, card->shortname, (void *)chip)) { |
1169 | snd_printk("unable to grab IRQ %d\n", pci->irq); | 1169 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
1170 | snd_intel8x0_free(chip); | 1170 | snd_intel8x0_free(chip); |
1171 | return -EBUSY; | 1171 | return -EBUSY; |
1172 | } | 1172 | } |
diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c index 7b1b82521cf4..ad77b4145824 100644 --- a/sound/pci/maestro3.c +++ b/sound/pci/maestro3.c | |||
@@ -1492,7 +1492,7 @@ static int snd_m3_pcm_hw_params(snd_pcm_substream_t * substream, | |||
1492 | /* set buffer address */ | 1492 | /* set buffer address */ |
1493 | s->buffer_addr = substream->runtime->dma_addr; | 1493 | s->buffer_addr = substream->runtime->dma_addr; |
1494 | if (s->buffer_addr & 0x3) { | 1494 | if (s->buffer_addr & 0x3) { |
1495 | snd_printk("oh my, not aligned\n"); | 1495 | snd_printk(KERN_ERR "oh my, not aligned\n"); |
1496 | s->buffer_addr = s->buffer_addr & ~0x3; | 1496 | s->buffer_addr = s->buffer_addr & ~0x3; |
1497 | } | 1497 | } |
1498 | return 0; | 1498 | return 0; |
@@ -1942,7 +1942,7 @@ static int snd_m3_ac97_wait(m3_t *chip) | |||
1942 | return 0; | 1942 | return 0; |
1943 | } while (i-- > 0); | 1943 | } while (i-- > 0); |
1944 | 1944 | ||
1945 | snd_printk("ac97 serial bus busy\n"); | 1945 | snd_printk(KERN_ERR "ac97 serial bus busy\n"); |
1946 | return 1; | 1946 | return 1; |
1947 | } | 1947 | } |
1948 | 1948 | ||
@@ -2367,7 +2367,7 @@ static int __devinit snd_m3_assp_client_init(m3_t *chip, m3_dma_t *s, int index) | |||
2367 | address = 0x1100 + ((data_bytes/2) * index); | 2367 | address = 0x1100 + ((data_bytes/2) * index); |
2368 | 2368 | ||
2369 | if ((address + (data_bytes/2)) >= 0x1c00) { | 2369 | if ((address + (data_bytes/2)) >= 0x1c00) { |
2370 | snd_printk("no memory for %d bytes at ind %d (addr 0x%x)\n", | 2370 | snd_printk(KERN_ERR "no memory for %d bytes at ind %d (addr 0x%x)\n", |
2371 | data_bytes, index, address); | 2371 | data_bytes, index, address); |
2372 | return -ENOMEM; | 2372 | return -ENOMEM; |
2373 | } | 2373 | } |
@@ -2656,7 +2656,7 @@ snd_m3_create(snd_card_t *card, struct pci_dev *pci, | |||
2656 | /* check, if we can restrict PCI DMA transfers to 28 bits */ | 2656 | /* check, if we can restrict PCI DMA transfers to 28 bits */ |
2657 | if (pci_set_dma_mask(pci, 0x0fffffff) < 0 || | 2657 | if (pci_set_dma_mask(pci, 0x0fffffff) < 0 || |
2658 | pci_set_consistent_dma_mask(pci, 0x0fffffff) < 0) { | 2658 | pci_set_consistent_dma_mask(pci, 0x0fffffff) < 0) { |
2659 | snd_printk("architecture does not support 28bit PCI busmaster DMA\n"); | 2659 | snd_printk(KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n"); |
2660 | pci_disable_device(pci); | 2660 | pci_disable_device(pci); |
2661 | return -ENXIO; | 2661 | return -ENXIO; |
2662 | } | 2662 | } |
@@ -2741,7 +2741,7 @@ snd_m3_create(snd_card_t *card, struct pci_dev *pci, | |||
2741 | 2741 | ||
2742 | if (request_irq(pci->irq, snd_m3_interrupt, SA_INTERRUPT|SA_SHIRQ, | 2742 | if (request_irq(pci->irq, snd_m3_interrupt, SA_INTERRUPT|SA_SHIRQ, |
2743 | card->driver, (void *)chip)) { | 2743 | card->driver, (void *)chip)) { |
2744 | snd_printk("unable to grab IRQ %d\n", pci->irq); | 2744 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
2745 | snd_m3_free(chip); | 2745 | snd_m3_free(chip); |
2746 | return -ENOMEM; | 2746 | return -ENOMEM; |
2747 | } | 2747 | } |
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 | |||
320 | snd_nm256_write_buffer(nm256_t *chip, void *src, int offset, int size) | 320 | snd_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 | } |
diff --git a/sound/pci/rme32.c b/sound/pci/rme32.c index cd313af6ebcf..e6627b0e38e4 100644 --- a/sound/pci/rme32.c +++ b/sound/pci/rme32.c | |||
@@ -1369,13 +1369,13 @@ static int __devinit snd_rme32_create(rme32_t * rme32) | |||
1369 | rme32->port = pci_resource_start(rme32->pci, 0); | 1369 | rme32->port = pci_resource_start(rme32->pci, 0); |
1370 | 1370 | ||
1371 | if (request_irq(pci->irq, snd_rme32_interrupt, SA_INTERRUPT | SA_SHIRQ, "RME32", (void *) rme32)) { | 1371 | if (request_irq(pci->irq, snd_rme32_interrupt, SA_INTERRUPT | SA_SHIRQ, "RME32", (void *) rme32)) { |
1372 | snd_printk("unable to grab IRQ %d\n", pci->irq); | 1372 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
1373 | return -EBUSY; | 1373 | return -EBUSY; |
1374 | } | 1374 | } |
1375 | rme32->irq = pci->irq; | 1375 | rme32->irq = pci->irq; |
1376 | 1376 | ||
1377 | if ((rme32->iobase = ioremap_nocache(rme32->port, RME32_IO_SIZE)) == 0) { | 1377 | if ((rme32->iobase = ioremap_nocache(rme32->port, RME32_IO_SIZE)) == 0) { |
1378 | snd_printk("unable to remap memory region 0x%lx-0x%lx\n", | 1378 | snd_printk(KERN_ERR "unable to remap memory region 0x%lx-0x%lx\n", |
1379 | rme32->port, rme32->port + RME32_IO_SIZE - 1); | 1379 | rme32->port, rme32->port + RME32_IO_SIZE - 1); |
1380 | return -ENOMEM; | 1380 | return -ENOMEM; |
1381 | } | 1381 | } |
diff --git a/sound/pci/rme96.c b/sound/pci/rme96.c index c495cae78dbf..0eddeb16a10f 100644 --- a/sound/pci/rme96.c +++ b/sound/pci/rme96.c | |||
@@ -1570,13 +1570,13 @@ snd_rme96_create(rme96_t *rme96) | |||
1570 | rme96->port = pci_resource_start(rme96->pci, 0); | 1570 | rme96->port = pci_resource_start(rme96->pci, 0); |
1571 | 1571 | ||
1572 | if (request_irq(pci->irq, snd_rme96_interrupt, SA_INTERRUPT|SA_SHIRQ, "RME96", (void *)rme96)) { | 1572 | if (request_irq(pci->irq, snd_rme96_interrupt, SA_INTERRUPT|SA_SHIRQ, "RME96", (void *)rme96)) { |
1573 | snd_printk("unable to grab IRQ %d\n", pci->irq); | 1573 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
1574 | return -EBUSY; | 1574 | return -EBUSY; |
1575 | } | 1575 | } |
1576 | rme96->irq = pci->irq; | 1576 | rme96->irq = pci->irq; |
1577 | 1577 | ||
1578 | if ((rme96->iobase = ioremap_nocache(rme96->port, RME96_IO_SIZE)) == 0) { | 1578 | if ((rme96->iobase = ioremap_nocache(rme96->port, RME96_IO_SIZE)) == 0) { |
1579 | snd_printk("unable to remap memory region 0x%lx-0x%lx\n", rme96->port, rme96->port + RME96_IO_SIZE - 1); | 1579 | snd_printk(KERN_ERR "unable to remap memory region 0x%lx-0x%lx\n", rme96->port, rme96->port + RME96_IO_SIZE - 1); |
1580 | return -ENOMEM; | 1580 | return -ENOMEM; |
1581 | } | 1581 | } |
1582 | 1582 | ||
diff --git a/sound/pci/rme9652/rme9652.c b/sound/pci/rme9652/rme9652.c index b600f45e1834..59fcef9b6b81 100644 --- a/sound/pci/rme9652/rme9652.c +++ b/sound/pci/rme9652/rme9652.c | |||
@@ -779,7 +779,7 @@ static inline int rme9652_spdif_sample_rate(rme9652_t *s) | |||
779 | break; | 779 | break; |
780 | 780 | ||
781 | default: | 781 | default: |
782 | snd_printk("%s: unknown S/PDIF input rate (bits = 0x%x)\n", | 782 | snd_printk(KERN_ERR "%s: unknown S/PDIF input rate (bits = 0x%x)\n", |
783 | s->card_name, rate_bits); | 783 | s->card_name, rate_bits); |
784 | return 0; | 784 | return 0; |
785 | break; | 785 | break; |
@@ -2496,12 +2496,12 @@ static int __devinit snd_rme9652_create(snd_card_t *card, | |||
2496 | rme9652->port = pci_resource_start(pci, 0); | 2496 | rme9652->port = pci_resource_start(pci, 0); |
2497 | rme9652->iobase = ioremap_nocache(rme9652->port, RME9652_IO_EXTENT); | 2497 | rme9652->iobase = ioremap_nocache(rme9652->port, RME9652_IO_EXTENT); |
2498 | if (rme9652->iobase == NULL) { | 2498 | if (rme9652->iobase == NULL) { |
2499 | snd_printk("unable to remap region 0x%lx-0x%lx\n", rme9652->port, rme9652->port + RME9652_IO_EXTENT - 1); | 2499 | snd_printk(KERN_ERR "unable to remap region 0x%lx-0x%lx\n", rme9652->port, rme9652->port + RME9652_IO_EXTENT - 1); |
2500 | return -EBUSY; | 2500 | return -EBUSY; |
2501 | } | 2501 | } |
2502 | 2502 | ||
2503 | if (request_irq(pci->irq, snd_rme9652_interrupt, SA_INTERRUPT|SA_SHIRQ, "rme9652", (void *)rme9652)) { | 2503 | if (request_irq(pci->irq, snd_rme9652_interrupt, SA_INTERRUPT|SA_SHIRQ, "rme9652", (void *)rme9652)) { |
2504 | snd_printk("unable to request IRQ %d\n", pci->irq); | 2504 | snd_printk(KERN_ERR "unable to request IRQ %d\n", pci->irq); |
2505 | return -EBUSY; | 2505 | return -EBUSY; |
2506 | } | 2506 | } |
2507 | rme9652->irq = pci->irq; | 2507 | rme9652->irq = pci->irq; |
diff --git a/sound/pci/sonicvibes.c b/sound/pci/sonicvibes.c index 4f64814dfef0..9a35474aad05 100644 --- a/sound/pci/sonicvibes.c +++ b/sound/pci/sonicvibes.c | |||
@@ -591,7 +591,7 @@ static irqreturn_t snd_sonicvibes_interrupt(int irq, void *dev_id, struct pt_reg | |||
591 | return IRQ_NONE; | 591 | return IRQ_NONE; |
592 | if (status == 0xff) { /* failure */ | 592 | if (status == 0xff) { /* failure */ |
593 | outb(sonic->irqmask = ~0, SV_REG(sonic, IRQMASK)); | 593 | outb(sonic->irqmask = ~0, SV_REG(sonic, IRQMASK)); |
594 | snd_printk("IRQ failure - interrupts disabled!!\n"); | 594 | snd_printk(KERN_ERR "IRQ failure - interrupts disabled!!\n"); |
595 | return IRQ_HANDLED; | 595 | return IRQ_HANDLED; |
596 | } | 596 | } |
597 | if (sonic->pcm) { | 597 | if (sonic->pcm) { |
@@ -1239,7 +1239,7 @@ static int __devinit snd_sonicvibes_create(snd_card_t * card, | |||
1239 | /* check, if we can restrict PCI DMA transfers to 24 bits */ | 1239 | /* check, if we can restrict PCI DMA transfers to 24 bits */ |
1240 | if (pci_set_dma_mask(pci, 0x00ffffff) < 0 || | 1240 | if (pci_set_dma_mask(pci, 0x00ffffff) < 0 || |
1241 | pci_set_consistent_dma_mask(pci, 0x00ffffff) < 0) { | 1241 | pci_set_consistent_dma_mask(pci, 0x00ffffff) < 0) { |
1242 | snd_printk("architecture does not support 24bit PCI busmaster DMA\n"); | 1242 | snd_printk(KERN_ERR "architecture does not support 24bit PCI busmaster DMA\n"); |
1243 | pci_disable_device(pci); | 1243 | pci_disable_device(pci); |
1244 | return -ENXIO; | 1244 | return -ENXIO; |
1245 | } | 1245 | } |
@@ -1267,7 +1267,7 @@ static int __devinit snd_sonicvibes_create(snd_card_t * card, | |||
1267 | sonic->game_port = pci_resource_start(pci, 4); | 1267 | sonic->game_port = pci_resource_start(pci, 4); |
1268 | 1268 | ||
1269 | if (request_irq(pci->irq, snd_sonicvibes_interrupt, SA_INTERRUPT|SA_SHIRQ, "S3 SonicVibes", (void *)sonic)) { | 1269 | if (request_irq(pci->irq, snd_sonicvibes_interrupt, SA_INTERRUPT|SA_SHIRQ, "S3 SonicVibes", (void *)sonic)) { |
1270 | snd_printk("unable to grab IRQ %d\n", pci->irq); | 1270 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
1271 | snd_sonicvibes_free(sonic); | 1271 | snd_sonicvibes_free(sonic); |
1272 | return -EBUSY; | 1272 | return -EBUSY; |
1273 | } | 1273 | } |
@@ -1281,24 +1281,24 @@ static int __devinit snd_sonicvibes_create(snd_card_t * card, | |||
1281 | if (!dmaa) { | 1281 | if (!dmaa) { |
1282 | dmaa = dmaio; | 1282 | dmaa = dmaio; |
1283 | dmaio += 0x10; | 1283 | dmaio += 0x10; |
1284 | snd_printk("BIOS did not allocate DDMA channel A i/o, allocated at 0x%x\n", dmaa); | 1284 | snd_printk(KERN_INFO "BIOS did not allocate DDMA channel A i/o, allocated at 0x%x\n", dmaa); |
1285 | } | 1285 | } |
1286 | if (!dmac) { | 1286 | if (!dmac) { |
1287 | dmac = dmaio; | 1287 | dmac = dmaio; |
1288 | dmaio += 0x10; | 1288 | dmaio += 0x10; |
1289 | snd_printk("BIOS did not allocate DDMA channel C i/o, allocated at 0x%x\n", dmac); | 1289 | snd_printk(KERN_INFO "BIOS did not allocate DDMA channel C i/o, allocated at 0x%x\n", dmac); |
1290 | } | 1290 | } |
1291 | pci_write_config_dword(pci, 0x40, dmaa); | 1291 | pci_write_config_dword(pci, 0x40, dmaa); |
1292 | pci_write_config_dword(pci, 0x48, dmac); | 1292 | pci_write_config_dword(pci, 0x48, dmac); |
1293 | 1293 | ||
1294 | if ((sonic->res_dmaa = request_region(dmaa, 0x10, "S3 SonicVibes DDMA-A")) == NULL) { | 1294 | if ((sonic->res_dmaa = request_region(dmaa, 0x10, "S3 SonicVibes DDMA-A")) == NULL) { |
1295 | snd_sonicvibes_free(sonic); | 1295 | snd_sonicvibes_free(sonic); |
1296 | snd_printk("unable to grab DDMA-A port at 0x%x-0x%x\n", dmaa, dmaa + 0x10 - 1); | 1296 | snd_printk(KERN_ERR "unable to grab DDMA-A port at 0x%x-0x%x\n", dmaa, dmaa + 0x10 - 1); |
1297 | return -EBUSY; | 1297 | return -EBUSY; |
1298 | } | 1298 | } |
1299 | if ((sonic->res_dmac = request_region(dmac, 0x10, "S3 SonicVibes DDMA-C")) == NULL) { | 1299 | if ((sonic->res_dmac = request_region(dmac, 0x10, "S3 SonicVibes DDMA-C")) == NULL) { |
1300 | snd_sonicvibes_free(sonic); | 1300 | snd_sonicvibes_free(sonic); |
1301 | snd_printk("unable to grab DDMA-C port at 0x%x-0x%x\n", dmac, dmac + 0x10 - 1); | 1301 | snd_printk(KERN_ERR "unable to grab DDMA-C port at 0x%x-0x%x\n", dmac, dmac + 0x10 - 1); |
1302 | return -EBUSY; | 1302 | return -EBUSY; |
1303 | } | 1303 | } |
1304 | 1304 | ||
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; |
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c index 3fdb3b1d4e83..9b2bea866d1b 100644 --- a/sound/pci/via82xx.c +++ b/sound/pci/via82xx.c | |||
@@ -865,7 +865,7 @@ static snd_pcm_uframes_t snd_via8233_pcm_pointer(snd_pcm_substream_t *substream) | |||
865 | idx = count >> 24; | 865 | idx = count >> 24; |
866 | if (idx >= viadev->tbl_entries) { | 866 | if (idx >= viadev->tbl_entries) { |
867 | #ifdef POINTER_DEBUG | 867 | #ifdef POINTER_DEBUG |
868 | printk("fail: invalid idx = %i/%i\n", idx, viadev->tbl_entries); | 868 | printk(KERN_DEBUG "fail: invalid idx = %i/%i\n", idx, viadev->tbl_entries); |
869 | #endif | 869 | #endif |
870 | res = viadev->lastpos; | 870 | res = viadev->lastpos; |
871 | } else { | 871 | } else { |
@@ -2032,7 +2032,7 @@ static int snd_via82xx_chip_init(via82xx_t *chip) | |||
2032 | } while (time_before(jiffies, end_time)); | 2032 | } while (time_before(jiffies, end_time)); |
2033 | 2033 | ||
2034 | if ((val = snd_via82xx_codec_xread(chip)) & VIA_REG_AC97_BUSY) | 2034 | if ((val = snd_via82xx_codec_xread(chip)) & VIA_REG_AC97_BUSY) |
2035 | snd_printk("AC'97 codec is not ready [0x%x]\n", val); | 2035 | snd_printk(KERN_ERR "AC'97 codec is not ready [0x%x]\n", val); |
2036 | 2036 | ||
2037 | #if 0 /* FIXME: we don't support the second codec yet so skip the detection now.. */ | 2037 | #if 0 /* FIXME: we don't support the second codec yet so skip the detection now.. */ |
2038 | snd_via82xx_codec_xwrite(chip, VIA_REG_AC97_READ | | 2038 | snd_via82xx_codec_xwrite(chip, VIA_REG_AC97_READ | |
@@ -2228,7 +2228,7 @@ static int __devinit snd_via82xx_create(snd_card_t * card, | |||
2228 | snd_via8233_interrupt : snd_via686_interrupt, | 2228 | snd_via8233_interrupt : snd_via686_interrupt, |
2229 | SA_INTERRUPT|SA_SHIRQ, | 2229 | SA_INTERRUPT|SA_SHIRQ, |
2230 | card->driver, (void *)chip)) { | 2230 | card->driver, (void *)chip)) { |
2231 | snd_printk("unable to grab IRQ %d\n", pci->irq); | 2231 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
2232 | snd_via82xx_free(chip); | 2232 | snd_via82xx_free(chip); |
2233 | return -EBUSY; | 2233 | return -EBUSY; |
2234 | } | 2234 | } |
diff --git a/sound/pci/via82xx_modem.c b/sound/pci/via82xx_modem.c index ff56eb8552e6..bc7330ace96a 100644 --- a/sound/pci/via82xx_modem.c +++ b/sound/pci/via82xx_modem.c | |||
@@ -570,7 +570,7 @@ static inline unsigned int calc_linear_pos(viadev_t *viadev, unsigned int idx, u | |||
570 | res = viadev->lastpos; | 570 | res = viadev->lastpos; |
571 | } else if (check_invalid_pos(viadev, res)) { | 571 | } else if (check_invalid_pos(viadev, res)) { |
572 | #ifdef POINTER_DEBUG | 572 | #ifdef POINTER_DEBUG |
573 | printk("fail: idx = %i/%i, lastpos = 0x%x, bufsize2 = 0x%x, offsize = 0x%x, size = 0x%x, count = 0x%x\n", idx, viadev->tbl_entries, viadev->lastpos, viadev->bufsize2, viadev->idx_table[idx].offset, viadev->idx_table[idx].size, count); | 573 | printk(KERN_DEBUG "fail: idx = %i/%i, lastpos = 0x%x, bufsize2 = 0x%x, offsize = 0x%x, size = 0x%x, count = 0x%x\n", idx, viadev->tbl_entries, viadev->lastpos, viadev->bufsize2, viadev->idx_table[idx].offset, viadev->idx_table[idx].size, count); |
574 | #endif | 574 | #endif |
575 | if (count && size < count) { | 575 | if (count && size < count) { |
576 | snd_printd(KERN_ERR "invalid via82xx_cur_ptr, using last valid pointer\n"); | 576 | snd_printd(KERN_ERR "invalid via82xx_cur_ptr, using last valid pointer\n"); |
@@ -973,7 +973,7 @@ static int snd_via82xx_chip_init(via82xx_t *chip) | |||
973 | } while (time_before(jiffies, end_time)); | 973 | } while (time_before(jiffies, end_time)); |
974 | 974 | ||
975 | if ((val = snd_via82xx_codec_xread(chip)) & VIA_REG_AC97_BUSY) | 975 | if ((val = snd_via82xx_codec_xread(chip)) & VIA_REG_AC97_BUSY) |
976 | snd_printk("AC'97 codec is not ready [0x%x]\n", val); | 976 | snd_printk(KERN_ERR "AC'97 codec is not ready [0x%x]\n", val); |
977 | 977 | ||
978 | snd_via82xx_codec_xwrite(chip, VIA_REG_AC97_READ | | 978 | snd_via82xx_codec_xwrite(chip, VIA_REG_AC97_READ | |
979 | VIA_REG_AC97_SECONDARY_VALID | | 979 | VIA_REG_AC97_SECONDARY_VALID | |
@@ -1102,7 +1102,7 @@ static int __devinit snd_via82xx_create(snd_card_t * card, | |||
1102 | chip->port = pci_resource_start(pci, 0); | 1102 | chip->port = pci_resource_start(pci, 0); |
1103 | if (request_irq(pci->irq, snd_via82xx_interrupt, SA_INTERRUPT|SA_SHIRQ, | 1103 | if (request_irq(pci->irq, snd_via82xx_interrupt, SA_INTERRUPT|SA_SHIRQ, |
1104 | card->driver, (void *)chip)) { | 1104 | card->driver, (void *)chip)) { |
1105 | snd_printk("unable to grab IRQ %d\n", pci->irq); | 1105 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
1106 | snd_via82xx_free(chip); | 1106 | snd_via82xx_free(chip); |
1107 | return -EBUSY; | 1107 | return -EBUSY; |
1108 | } | 1108 | } |
diff --git a/sound/pci/ymfpci/ymfpci.c b/sound/pci/ymfpci/ymfpci.c index e50d744ae706..1bbba32517ff 100644 --- a/sound/pci/ymfpci/ymfpci.c +++ b/sound/pci/ymfpci/ymfpci.c | |||
@@ -320,7 +320,7 @@ static int __devinit snd_card_ymfpci_probe(struct pci_dev *pci, | |||
320 | pci_write_config_word(pci, PCIR_DSXG_LEGACY, legacy_ctrl); | 320 | pci_write_config_word(pci, PCIR_DSXG_LEGACY, legacy_ctrl); |
321 | } else if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) < 0) { | 321 | } else if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) < 0) { |
322 | snd_card_free(card); | 322 | snd_card_free(card); |
323 | snd_printk("cannot create opl3 hwdep\n"); | 323 | snd_printk(KERN_ERR "cannot create opl3 hwdep\n"); |
324 | return err; | 324 | return err; |
325 | } | 325 | } |
326 | } | 326 | } |
diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c index d27f3b56b513..a53117733d51 100644 --- a/sound/pci/ymfpci/ymfpci_main.c +++ b/sound/pci/ymfpci/ymfpci_main.c | |||
@@ -94,7 +94,7 @@ static int snd_ymfpci_codec_ready(ymfpci_t *chip, int secondary) | |||
94 | set_current_state(TASK_UNINTERRUPTIBLE); | 94 | set_current_state(TASK_UNINTERRUPTIBLE); |
95 | schedule_timeout(1); | 95 | schedule_timeout(1); |
96 | } while (time_before(jiffies, end_time)); | 96 | } while (time_before(jiffies, end_time)); |
97 | snd_printk("codec_ready: codec %i is not ready [0x%x]\n", secondary, snd_ymfpci_readw(chip, reg)); | 97 | snd_printk(KERN_ERR "codec_ready: codec %i is not ready [0x%x]\n", secondary, snd_ymfpci_readw(chip, reg)); |
98 | return -EBUSY; | 98 | return -EBUSY; |
99 | } | 99 | } |
100 | 100 | ||
@@ -2288,12 +2288,12 @@ int __devinit snd_ymfpci_create(snd_card_t * card, | |||
2288 | pci_set_master(pci); | 2288 | pci_set_master(pci); |
2289 | 2289 | ||
2290 | if ((chip->res_reg_area = request_mem_region(chip->reg_area_phys, 0x8000, "YMFPCI")) == NULL) { | 2290 | if ((chip->res_reg_area = request_mem_region(chip->reg_area_phys, 0x8000, "YMFPCI")) == NULL) { |
2291 | snd_printk("unable to grab memory region 0x%lx-0x%lx\n", chip->reg_area_phys, chip->reg_area_phys + 0x8000 - 1); | 2291 | snd_printk(KERN_ERR "unable to grab memory region 0x%lx-0x%lx\n", chip->reg_area_phys, chip->reg_area_phys + 0x8000 - 1); |
2292 | snd_ymfpci_free(chip); | 2292 | snd_ymfpci_free(chip); |
2293 | return -EBUSY; | 2293 | return -EBUSY; |
2294 | } | 2294 | } |
2295 | if (request_irq(pci->irq, snd_ymfpci_interrupt, SA_INTERRUPT|SA_SHIRQ, "YMFPCI", (void *) chip)) { | 2295 | if (request_irq(pci->irq, snd_ymfpci_interrupt, SA_INTERRUPT|SA_SHIRQ, "YMFPCI", (void *) chip)) { |
2296 | snd_printk("unable to grab IRQ %d\n", pci->irq); | 2296 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
2297 | snd_ymfpci_free(chip); | 2297 | snd_ymfpci_free(chip); |
2298 | return -EBUSY; | 2298 | return -EBUSY; |
2299 | } | 2299 | } |