Skip to content

L
linux
Commit 006de267 authored by Takashi Iwai's avatar Takashi Iwai
Browse files
Options

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

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent e6161653
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 25 deletions
sound/core/oss/pcm_oss.c
View file @ 006de267
...@@ -1160,9 +1160,11 @@ snd_pcm_sframes_t snd_pcm_oss_write3(struct snd_pcm_substream *substream, const ...@@ -1160,9 +1160,11 @@ snd_pcm_sframes_t snd_pcm_oss_write3(struct snd_pcm_substream *substream, const
runtime->status->state == SNDRV_PCM_STATE_SUSPENDED) { runtime->status->state == SNDRV_PCM_STATE_SUSPENDED) {
#ifdef OSS_DEBUG #ifdef OSS_DEBUG
if (runtime->status->state == SNDRV_PCM_STATE_XRUN) if (runtime->status->state == SNDRV_PCM_STATE_XRUN)
printk("pcm_oss: write: recovering from XRUN\n"); printk(KERN_DEBUG "pcm_oss: write: "
"recovering from XRUN\n");
else else
printk("pcm_oss: write: recovering from SUSPEND\n"); printk(KERN_DEBUG "pcm_oss: write: "
"recovering from SUSPEND\n");
#endif #endif
ret = snd_pcm_oss_prepare(substream); ret = snd_pcm_oss_prepare(substream);
if (ret < 0) if (ret < 0)
...@@ -1196,9 +1198,11 @@ snd_pcm_sframes_t snd_pcm_oss_read3(struct snd_pcm_substream *substream, char *p ...@@ -1196,9 +1198,11 @@ snd_pcm_sframes_t snd_pcm_oss_read3(struct snd_pcm_substream *substream, char *p
runtime->status->state == SNDRV_PCM_STATE_SUSPENDED) { runtime->status->state == SNDRV_PCM_STATE_SUSPENDED) {
#ifdef OSS_DEBUG #ifdef OSS_DEBUG
if (runtime->status->state == SNDRV_PCM_STATE_XRUN) if (runtime->status->state == SNDRV_PCM_STATE_XRUN)
printk("pcm_oss: read: recovering from XRUN\n"); printk(KERN_DEBUG "pcm_oss: read: "
"recovering from XRUN\n");
else else
printk("pcm_oss: read: recovering from SUSPEND\n"); printk(KERN_DEBUG "pcm_oss: read: "
"recovering from SUSPEND\n");
#endif #endif
ret = snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_DRAIN, NULL); ret = snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_DRAIN, NULL);
if (ret < 0) if (ret < 0)
...@@ -1242,9 +1246,11 @@ snd_pcm_sframes_t snd_pcm_oss_writev3(struct snd_pcm_substream *substream, void ...@@ -1242,9 +1246,11 @@ snd_pcm_sframes_t snd_pcm_oss_writev3(struct snd_pcm_substream *substream, void
runtime->status->state == SNDRV_PCM_STATE_SUSPENDED) { runtime->status->state == SNDRV_PCM_STATE_SUSPENDED) {
#ifdef OSS_DEBUG #ifdef OSS_DEBUG
if (runtime->status->state == SNDRV_PCM_STATE_XRUN) if (runtime->status->state == SNDRV_PCM_STATE_XRUN)
printk("pcm_oss: writev: recovering from XRUN\n"); printk(KERN_DEBUG "pcm_oss: writev: "
"recovering from XRUN\n");
else else
printk("pcm_oss: writev: recovering from SUSPEND\n"); printk(KERN_DEBUG "pcm_oss: writev: "
"recovering from SUSPEND\n");
#endif #endif
ret = snd_pcm_oss_prepare(substream); ret = snd_pcm_oss_prepare(substream);
if (ret < 0) if (ret < 0)
...@@ -1278,9 +1284,11 @@ snd_pcm_sframes_t snd_pcm_oss_readv3(struct snd_pcm_substream *substream, void * ...@@ -1278,9 +1284,11 @@ snd_pcm_sframes_t snd_pcm_oss_readv3(struct snd_pcm_substream *substream, void *
runtime->status->state == SNDRV_PCM_STATE_SUSPENDED) { runtime->status->state == SNDRV_PCM_STATE_SUSPENDED) {
#ifdef OSS_DEBUG #ifdef OSS_DEBUG
if (runtime->status->state == SNDRV_PCM_STATE_XRUN) if (runtime->status->state == SNDRV_PCM_STATE_XRUN)
printk("pcm_oss: readv: recovering from XRUN\n"); printk(KERN_DEBUG "pcm_oss: readv: "
"recovering from XRUN\n");
else else
printk("pcm_oss: readv: recovering from SUSPEND\n"); printk(KERN_DEBUG "pcm_oss: readv: "
"recovering from SUSPEND\n");
#endif #endif
ret = snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_DRAIN, NULL); ret = snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_DRAIN, NULL);
if (ret < 0) if (ret < 0)
...@@ -1533,7 +1541,7 @@ static int snd_pcm_oss_sync1(struct snd_pcm_substream *substream, size_t size) ...@@ -1533,7 +1541,7 @@ static int snd_pcm_oss_sync1(struct snd_pcm_substream *substream, size_t size)
init_waitqueue_entry(&wait, current); init_waitqueue_entry(&wait, current);
add_wait_queue(&runtime->sleep, &wait); add_wait_queue(&runtime->sleep, &wait);
#ifdef OSS_DEBUG #ifdef OSS_DEBUG
printk("sync1: size = %li\n", size); printk(KERN_DEBUG "sync1: size = %li\n", size);
#endif #endif
while (1) { while (1) {
result = snd_pcm_oss_write2(substream, runtime->oss.buffer, size, 1); result = snd_pcm_oss_write2(substream, runtime->oss.buffer, size, 1);
...@@ -1590,7 +1598,7 @@ static int snd_pcm_oss_sync(struct snd_pcm_oss_file *pcm_oss_file) ...@@ -1590,7 +1598,7 @@ static int snd_pcm_oss_sync(struct snd_pcm_oss_file *pcm_oss_file)
mutex_lock(&runtime->oss.params_lock); mutex_lock(&runtime->oss.params_lock);
if (runtime->oss.buffer_used > 0) { if (runtime->oss.buffer_used > 0) {
#ifdef OSS_DEBUG #ifdef OSS_DEBUG
printk("sync: buffer_used\n"); printk(KERN_DEBUG "sync: buffer_used\n");
#endif #endif
size = (8 * (runtime->oss.period_bytes - runtime->oss.buffer_used) + 7) / width; size = (8 * (runtime->oss.period_bytes - runtime->oss.buffer_used) + 7) / width;
snd_pcm_format_set_silence(format, snd_pcm_format_set_silence(format,
...@@ -1603,7 +1611,7 @@ static int snd_pcm_oss_sync(struct snd_pcm_oss_file *pcm_oss_file) ...@@ -1603,7 +1611,7 @@ static int snd_pcm_oss_sync(struct snd_pcm_oss_file *pcm_oss_file)
} }
} else if (runtime->oss.period_ptr > 0) { } else if (runtime->oss.period_ptr > 0) {
#ifdef OSS_DEBUG #ifdef OSS_DEBUG
printk("sync: period_ptr\n"); printk(KERN_DEBUG "sync: period_ptr\n");
#endif #endif
size = runtime->oss.period_bytes - runtime->oss.period_ptr; size = runtime->oss.period_bytes - runtime->oss.period_ptr;
snd_pcm_format_set_silence(format, snd_pcm_format_set_silence(format,
...@@ -1952,7 +1960,7 @@ static int snd_pcm_oss_set_trigger(struct snd_pcm_oss_file *pcm_oss_file, int tr ...@@ -1952,7 +1960,7 @@ static int snd_pcm_oss_set_trigger(struct snd_pcm_oss_file *pcm_oss_file, int tr
int err, cmd; int err, cmd;
#ifdef OSS_DEBUG #ifdef OSS_DEBUG
printk("pcm_oss: trigger = 0x%x\n", trigger); printk(KERN_DEBUG "pcm_oss: trigger = 0x%x\n", trigger);
#endif #endif
psubstream = pcm_oss_file->streams[SNDRV_PCM_STREAM_PLAYBACK]; psubstream = pcm_oss_file->streams[SNDRV_PCM_STREAM_PLAYBACK];
...@@ -2170,7 +2178,9 @@ static int snd_pcm_oss_get_space(struct snd_pcm_oss_file *pcm_oss_file, int stre ...@@ -2170,7 +2178,9 @@ static int snd_pcm_oss_get_space(struct snd_pcm_oss_file *pcm_oss_file, int stre
} }
#ifdef OSS_DEBUG #ifdef OSS_DEBUG
printk("pcm_oss: space: bytes = %i, fragments = %i, fragstotal = %i, fragsize = %i\n", info.bytes, info.fragments, info.fragstotal, info.fragsize); printk(KERN_DEBUG "pcm_oss: space: bytes = %i, fragments = %i, "
"fragstotal = %i, fragsize = %i\n",
info.bytes, info.fragments, info.fragstotal, info.fragsize);
#endif #endif
if (copy_to_user(_info, &info, sizeof(info))) if (copy_to_user(_info, &info, sizeof(info)))
return -EFAULT; return -EFAULT;
...@@ -2473,7 +2483,7 @@ static long snd_pcm_oss_ioctl(struct file *file, unsigned int cmd, unsigned long ...@@ -2473,7 +2483,7 @@ static long snd_pcm_oss_ioctl(struct file *file, unsigned int cmd, unsigned long
if (((cmd >> 8) & 0xff) != 'P') if (((cmd >> 8) & 0xff) != 'P')
return -EINVAL; return -EINVAL;
#ifdef OSS_DEBUG #ifdef OSS_DEBUG
printk("pcm_oss: ioctl = 0x%x\n", cmd); printk(KERN_DEBUG "pcm_oss: ioctl = 0x%x\n", cmd);
#endif #endif
switch (cmd) { switch (cmd) {
case SNDCTL_DSP_RESET: case SNDCTL_DSP_RESET:
...@@ -2627,7 +2637,8 @@ static ssize_t snd_pcm_oss_read(struct file *file, char __user *buf, size_t coun ...@@ -2627,7 +2637,8 @@ static ssize_t snd_pcm_oss_read(struct file *file, char __user *buf, size_t coun
#else #else
{ {
ssize_t res = snd_pcm_oss_read1(substream, buf, count); ssize_t res = snd_pcm_oss_read1(substream, buf, count);
printk("pcm_oss: read %li bytes (returned %li bytes)\n", (long)count, (long)res); printk(KERN_DEBUG "pcm_oss: read %li bytes "
"(returned %li bytes)\n", (long)count, (long)res);
return res; return res;
} }
#endif #endif
...@@ -2646,7 +2657,8 @@ static ssize_t snd_pcm_oss_write(struct file *file, const char __user *buf, size ...@@ -2646,7 +2657,8 @@ static ssize_t snd_pcm_oss_write(struct file *file, const char __user *buf, size
substream->f_flags = file->f_flags & O_NONBLOCK; substream->f_flags = file->f_flags & O_NONBLOCK;
result = snd_pcm_oss_write1(substream, buf, count); result = snd_pcm_oss_write1(substream, buf, count);
#ifdef OSS_DEBUG #ifdef OSS_DEBUG
printk("pcm_oss: write %li bytes (wrote %li bytes)\n", (long)count, (long)result); printk(KERN_DEBUG "pcm_oss: write %li bytes (wrote %li bytes)\n",
(long)count, (long)result);
#endif #endif
return result; return result;
} }
...@@ -2720,7 +2732,7 @@ static int snd_pcm_oss_mmap(struct file *file, struct vm_area_struct *area) ...@@ -2720,7 +2732,7 @@ static int snd_pcm_oss_mmap(struct file *file, struct vm_area_struct *area)
int err; int err;
#ifdef OSS_DEBUG #ifdef OSS_DEBUG
printk("pcm_oss: mmap begin\n"); printk(KERN_DEBUG "pcm_oss: mmap begin\n");
#endif #endif
pcm_oss_file = file->private_data; pcm_oss_file = file->private_data;
switch ((area->vm_flags & (VM_READ | VM_WRITE))) { switch ((area->vm_flags & (VM_READ | VM_WRITE))) {
...@@ -2770,7 +2782,8 @@ static int snd_pcm_oss_mmap(struct file *file, struct vm_area_struct *area) ...@@ -2770,7 +2782,8 @@ static int snd_pcm_oss_mmap(struct file *file, struct vm_area_struct *area)
runtime->silence_threshold = 0; runtime->silence_threshold = 0;
runtime->silence_size = 0; runtime->silence_size = 0;
#ifdef OSS_DEBUG #ifdef OSS_DEBUG
printk("pcm_oss: mmap ok, bytes = 0x%x\n", runtime->oss.mmap_bytes); printk(KERN_DEBUG "pcm_oss: mmap ok, bytes = 0x%x\n",
runtime->oss.mmap_bytes);
#endif #endif
/* In mmap mode we never stop */ /* In mmap mode we never stop */
runtime->stop_threshold = runtime->boundary; runtime->stop_threshold = runtime->boundary;
......
sound/core/oss/pcm_plugin.h
View file @ 006de267
...@@ -176,9 +176,9 @@ static inline int snd_pcm_plug_slave_format(int format, struct snd_mask *format_ ...@@ -176,9 +176,9 @@ static inline int snd_pcm_plug_slave_format(int format, struct snd_mask *format_
#endif #endif
#ifdef PLUGIN_DEBUG #ifdef PLUGIN_DEBUG
#define pdprintf( fmt, args... ) printk( "plugin: " fmt, ##args) #define pdprintf(fmt, args...) printk(KERN_DEBUG "plugin: " fmt, ##args)
#else #else
#define pdprintf( fmt, args... ) #define pdprintf(fmt, args...)
#endif #endif
#endif /* __PCM_PLUGIN_H */ #endif /* __PCM_PLUGIN_H */
sound/core/pcm_native.c
View file @ 006de267
...@@ -186,7 +186,7 @@ int snd_pcm_hw_refine(struct snd_pcm_substream *substream, ...@@ -186,7 +186,7 @@ int snd_pcm_hw_refine(struct snd_pcm_substream *substream,
if (!(params->rmask & (1 << k))) if (!(params->rmask & (1 << k)))
continue; continue;
#ifdef RULES_DEBUG #ifdef RULES_DEBUG
printk("%s = ", snd_pcm_hw_param_names[k]); printk(KERN_DEBUG "%s = ", snd_pcm_hw_param_names[k]);
printk("%04x%04x%04x%04x -> ", m->bits[3], m->bits[2], m->bits[1], m->bits[0]); printk("%04x%04x%04x%04x -> ", m->bits[3], m->bits[2], m->bits[1], m->bits[0]);
#endif #endif
changed = snd_mask_refine(m, constrs_mask(constrs, k)); changed = snd_mask_refine(m, constrs_mask(constrs, k));
...@@ -206,7 +206,7 @@ int snd_pcm_hw_refine(struct snd_pcm_substream *substream, ...@@ -206,7 +206,7 @@ int snd_pcm_hw_refine(struct snd_pcm_substream *substream,
if (!(params->rmask & (1 << k))) if (!(params->rmask & (1 << k)))
continue; continue;
#ifdef RULES_DEBUG #ifdef RULES_DEBUG
printk("%s = ", snd_pcm_hw_param_names[k]); printk(KERN_DEBUG "%s = ", snd_pcm_hw_param_names[k]);
if (i->empty) if (i->empty)
printk("empty"); printk("empty");
else else
...@@ -251,7 +251,7 @@ int snd_pcm_hw_refine(struct snd_pcm_substream *substream, ...@@ -251,7 +251,7 @@ int snd_pcm_hw_refine(struct snd_pcm_substream *substream,
if (!doit) if (!doit)
continue; continue;
#ifdef RULES_DEBUG #ifdef RULES_DEBUG
printk("Rule %d [%p]: ", k, r->func); printk(KERN_DEBUG "Rule %d [%p]: ", k, r->func);
if (r->var >= 0) { if (r->var >= 0) {
printk("%s = ", snd_pcm_hw_param_names[r->var]); printk("%s = ", snd_pcm_hw_param_names[r->var]);
if (hw_is_mask(r->var)) { if (hw_is_mask(r->var)) {
......
sound/core/seq/oss/seq_oss_device.h
View file @ 006de267
...@@ -181,7 +181,7 @@ char *enabled_str(int bool); ...@@ -181,7 +181,7 @@ char *enabled_str(int bool);
/* for debug */ /* for debug */
#ifdef SNDRV_SEQ_OSS_DEBUG #ifdef SNDRV_SEQ_OSS_DEBUG
extern int seq_oss_debug; extern int seq_oss_debug;
#define debug_printk(x) do { if (seq_oss_debug > 0) snd_printk x; } while (0) #define debug_printk(x) do { if (seq_oss_debug > 0) snd_printd x; } while (0)
#else #else
#define debug_printk(x) /**/ #define debug_printk(x) /**/
#endif #endif
......
sound/core/seq/seq_prioq.c
View file @ 006de267
...@@ -321,7 +321,8 @@ void snd_seq_prioq_leave(struct snd_seq_prioq * f, int client, int timestamp) ...@@ -321,7 +321,8 @@ void snd_seq_prioq_leave(struct snd_seq_prioq * f, int client, int timestamp)
freeprev = cell; freeprev = cell;
} else { } else {
#if 0 #if 0
printk("type = %i, source = %i, dest = %i, client = %i\n", printk(KERN_DEBUG "type = %i, source = %i, dest = %i, "
"client = %i\n",
cell->event.type, cell->event.type,
cell->event.source.client, cell->event.source.client,
cell->event.dest.client, cell->event.dest.client,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7