ALSA: Add missing KERN_* prefix to printk in sound/core

+31 -18

sound/core/oss/pcm_oss.c

··· 1160 1160 runtime->status->state == SNDRV_PCM_STATE_SUSPENDED) { 1161 1161 #ifdef OSS_DEBUG 1162 1162 if (runtime->status->state == SNDRV_PCM_STATE_XRUN) 1163 - printk("pcm_oss: write: recovering from XRUN\n"); 1163 + printk(KERN_DEBUG "pcm_oss: write: " 1164 + "recovering from XRUN\n"); 1164 1165 else 1165 - printk("pcm_oss: write: recovering from SUSPEND\n"); 1166 + printk(KERN_DEBUG "pcm_oss: write: " 1167 + "recovering from SUSPEND\n"); 1166 1168 #endif 1167 1169 ret = snd_pcm_oss_prepare(substream); 1168 1170 if (ret < 0) ··· 1198 1196 runtime->status->state == SNDRV_PCM_STATE_SUSPENDED) { 1199 1197 #ifdef OSS_DEBUG 1200 1198 if (runtime->status->state == SNDRV_PCM_STATE_XRUN) 1201 - printk("pcm_oss: read: recovering from XRUN\n"); 1199 + printk(KERN_DEBUG "pcm_oss: read: " 1200 + "recovering from XRUN\n"); 1202 1201 else 1203 - printk("pcm_oss: read: recovering from SUSPEND\n"); 1202 + printk(KERN_DEBUG "pcm_oss: read: " 1203 + "recovering from SUSPEND\n"); 1204 1204 #endif 1205 1205 ret = snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_DRAIN, NULL); 1206 1206 if (ret < 0) ··· 1246 1242 runtime->status->state == SNDRV_PCM_STATE_SUSPENDED) { 1247 1243 #ifdef OSS_DEBUG 1248 1244 if (runtime->status->state == SNDRV_PCM_STATE_XRUN) 1249 - printk("pcm_oss: writev: recovering from XRUN\n"); 1245 + printk(KERN_DEBUG "pcm_oss: writev: " 1246 + "recovering from XRUN\n"); 1250 1247 else 1251 - printk("pcm_oss: writev: recovering from SUSPEND\n"); 1248 + printk(KERN_DEBUG "pcm_oss: writev: " 1249 + "recovering from SUSPEND\n"); 1252 1250 #endif 1253 1251 ret = snd_pcm_oss_prepare(substream); 1254 1252 if (ret < 0) ··· 1284 1278 runtime->status->state == SNDRV_PCM_STATE_SUSPENDED) { 1285 1279 #ifdef OSS_DEBUG 1286 1280 if (runtime->status->state == SNDRV_PCM_STATE_XRUN) 1287 - printk("pcm_oss: readv: recovering from XRUN\n"); 1281 + printk(KERN_DEBUG "pcm_oss: readv: " 1282 + "recovering from XRUN\n"); 1288 1283 else 1289 - printk("pcm_oss: readv: recovering from SUSPEND\n"); 1284 + printk(KERN_DEBUG "pcm_oss: readv: " 1285 + "recovering from SUSPEND\n"); 1290 1286 #endif 1291 1287 ret = snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_DRAIN, NULL); 1292 1288 if (ret < 0) ··· 1541 1533 init_waitqueue_entry(&wait, current); 1542 1534 add_wait_queue(&runtime->sleep, &wait); 1543 1535 #ifdef OSS_DEBUG 1544 - printk("sync1: size = %li\n", size); 1536 + printk(KERN_DEBUG "sync1: size = %li\n", size); 1545 1537 #endif 1546 1538 while (1) { 1547 1539 result = snd_pcm_oss_write2(substream, runtime->oss.buffer, size, 1); ··· 1598 1590 mutex_lock(&runtime->oss.params_lock); 1599 1591 if (runtime->oss.buffer_used > 0) { 1600 1592 #ifdef OSS_DEBUG 1601 - printk("sync: buffer_used\n"); 1593 + printk(KERN_DEBUG "sync: buffer_used\n"); 1602 1594 #endif 1603 1595 size = (8 * (runtime->oss.period_bytes - runtime->oss.buffer_used) + 7) / width; 1604 1596 snd_pcm_format_set_silence(format, ··· 1611 1603 } 1612 1604 } else if (runtime->oss.period_ptr > 0) { 1613 1605 #ifdef OSS_DEBUG 1614 - printk("sync: period_ptr\n"); 1606 + printk(KERN_DEBUG "sync: period_ptr\n"); 1615 1607 #endif 1616 1608 size = runtime->oss.period_bytes - runtime->oss.period_ptr; 1617 1609 snd_pcm_format_set_silence(format, ··· 1960 1952 int err, cmd; 1961 1953 1962 1954 #ifdef OSS_DEBUG 1963 - printk("pcm_oss: trigger = 0x%x\n", trigger); 1955 + printk(KERN_DEBUG "pcm_oss: trigger = 0x%x\n", trigger); 1964 1956 #endif 1965 1957 1966 1958 psubstream = pcm_oss_file->streams[SNDRV_PCM_STREAM_PLAYBACK]; ··· 2178 2170 } 2179 2171 2180 2172 #ifdef OSS_DEBUG 2181 - printk("pcm_oss: space: bytes = %i, fragments = %i, fragstotal = %i, fragsize = %i\n", info.bytes, info.fragments, info.fragstotal, info.fragsize); 2173 + printk(KERN_DEBUG "pcm_oss: space: bytes = %i, fragments = %i, " 2174 + "fragstotal = %i, fragsize = %i\n", 2175 + info.bytes, info.fragments, info.fragstotal, info.fragsize); 2182 2176 #endif 2183 2177 if (copy_to_user(_info, &info, sizeof(info))) 2184 2178 return -EFAULT; ··· 2483 2473 if (((cmd >> 8) & 0xff) != 'P') 2484 2474 return -EINVAL; 2485 2475 #ifdef OSS_DEBUG 2486 - printk("pcm_oss: ioctl = 0x%x\n", cmd); 2476 + printk(KERN_DEBUG "pcm_oss: ioctl = 0x%x\n", cmd); 2487 2477 #endif 2488 2478 switch (cmd) { 2489 2479 case SNDCTL_DSP_RESET: ··· 2637 2627 #else 2638 2628 { 2639 2629 ssize_t res = snd_pcm_oss_read1(substream, buf, count); 2640 - printk("pcm_oss: read %li bytes (returned %li bytes)\n", (long)count, (long)res); 2630 + printk(KERN_DEBUG "pcm_oss: read %li bytes " 2631 + "(returned %li bytes)\n", (long)count, (long)res); 2641 2632 return res; 2642 2633 } 2643 2634 #endif ··· 2657 2646 substream->f_flags = file->f_flags & O_NONBLOCK; 2658 2647 result = snd_pcm_oss_write1(substream, buf, count); 2659 2648 #ifdef OSS_DEBUG 2660 - printk("pcm_oss: write %li bytes (wrote %li bytes)\n", (long)count, (long)result); 2649 + printk(KERN_DEBUG "pcm_oss: write %li bytes (wrote %li bytes)\n", 2650 + (long)count, (long)result); 2661 2651 #endif 2662 2652 return result; 2663 2653 } ··· 2732 2720 int err; 2733 2721 2734 2722 #ifdef OSS_DEBUG 2735 - printk("pcm_oss: mmap begin\n"); 2723 + printk(KERN_DEBUG "pcm_oss: mmap begin\n"); 2736 2724 #endif 2737 2725 pcm_oss_file = file->private_data; 2738 2726 switch ((area->vm_flags & (VM_READ | VM_WRITE))) { ··· 2782 2770 runtime->silence_threshold = 0; 2783 2771 runtime->silence_size = 0; 2784 2772 #ifdef OSS_DEBUG 2785 - printk("pcm_oss: mmap ok, bytes = 0x%x\n", runtime->oss.mmap_bytes); 2773 + printk(KERN_DEBUG "pcm_oss: mmap ok, bytes = 0x%x\n", 2774 + runtime->oss.mmap_bytes); 2786 2775 #endif 2787 2776 /* In mmap mode we never stop */ 2788 2777 runtime->stop_threshold = runtime->boundary;

+2 -2

sound/core/oss/pcm_plugin.h

··· 176 176 #endif 177 177 178 178 #ifdef PLUGIN_DEBUG 179 - #define pdprintf( fmt, args... ) printk( "plugin: " fmt, ##args) 179 + #define pdprintf(fmt, args...) printk(KERN_DEBUG "plugin: " fmt, ##args) 180 180 #else 181 - #define pdprintf( fmt, args... ) 181 + #define pdprintf(fmt, args...) 182 182 #endif 183 183 184 184 #endif /* __PCM_PLUGIN_H */

+3 -3

sound/core/pcm_native.c

··· 186 186 if (!(params->rmask & (1 << k))) 187 187 continue; 188 188 #ifdef RULES_DEBUG 189 - printk("%s = ", snd_pcm_hw_param_names[k]); 189 + printk(KERN_DEBUG "%s = ", snd_pcm_hw_param_names[k]); 190 190 printk("%04x%04x%04x%04x -> ", m->bits[3], m->bits[2], m->bits[1], m->bits[0]); 191 191 #endif 192 192 changed = snd_mask_refine(m, constrs_mask(constrs, k)); ··· 206 206 if (!(params->rmask & (1 << k))) 207 207 continue; 208 208 #ifdef RULES_DEBUG 209 - printk("%s = ", snd_pcm_hw_param_names[k]); 209 + printk(KERN_DEBUG "%s = ", snd_pcm_hw_param_names[k]); 210 210 if (i->empty) 211 211 printk("empty"); 212 212 else ··· 251 251 if (!doit) 252 252 continue; 253 253 #ifdef RULES_DEBUG 254 - printk("Rule %d [%p]: ", k, r->func); 254 + printk(KERN_DEBUG "Rule %d [%p]: ", k, r->func); 255 255 if (r->var >= 0) { 256 256 printk("%s = ", snd_pcm_hw_param_names[r->var]); 257 257 if (hw_is_mask(r->var)) {

+1 -1

sound/core/seq/oss/seq_oss_device.h

··· 181 181 /* for debug */ 182 182 #ifdef SNDRV_SEQ_OSS_DEBUG 183 183 extern int seq_oss_debug; 184 - #define debug_printk(x) do { if (seq_oss_debug > 0) snd_printk x; } while (0) 184 + #define debug_printk(x) do { if (seq_oss_debug > 0) snd_printd x; } while (0) 185 185 #else 186 186 #define debug_printk(x) /**/ 187 187 #endif

+2 -1

sound/core/seq/seq_prioq.c

··· 321 321 freeprev = cell; 322 322 } else { 323 323 #if 0 324 - printk("type = %i, source = %i, dest = %i, client = %i\n", 324 + printk(KERN_DEBUG "type = %i, source = %i, dest = %i, " 325 + "client = %i\n", 325 326 cell->event.type, 326 327 cell->event.source.client, 327 328 cell->event.dest.client,