Merge branch 'topic/misc' into for-linus

6 files changed, 40 insertions, 26 deletions

diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
index 699d2890535c..2864cefb773c 100644
--- a/sound/core/oss/pcm_oss.c
+++ b/sound/core/oss/pcm_oss.c
@@ -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) {
 #ifdef OSS_DEBUG
                         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
-                                printk("pcm_oss: write: recovering from SUSPEND\n");
+                                printk(KERN_DEBUG "pcm_oss: write: "
+                                       "recovering from SUSPEND\n");
 #endif
                         ret = snd_pcm_oss_prepare(substream);
                         if (ret < 0)
@@ -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) {
 #ifdef OSS_DEBUG
                         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
-                                printk("pcm_oss: read: recovering from SUSPEND\n");
+                                printk(KERN_DEBUG "pcm_oss: read: "
+                                       "recovering from SUSPEND\n");
 #endif
                         ret = snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_DRAIN, NULL);
                         if (ret < 0)
@@ -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) {
 #ifdef OSS_DEBUG
                         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
-                                printk("pcm_oss: writev: recovering from SUSPEND\n");
+                                printk(KERN_DEBUG "pcm_oss: writev: "
+                                       "recovering from SUSPEND\n");
 #endif
                         ret = snd_pcm_oss_prepare(substream);
                         if (ret < 0)
@@ -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) {
 #ifdef OSS_DEBUG
                         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
-                                printk("pcm_oss: readv: recovering from SUSPEND\n");
+                                printk(KERN_DEBUG "pcm_oss: readv: "
+                                       "recovering from SUSPEND\n");
 #endif
                         ret = snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_DRAIN, NULL);
                         if (ret < 0)
@@ -1533,7 +1541,7 @@ static int snd_pcm_oss_sync1(struct snd_pcm_substream *substream, size_t size)
         init_waitqueue_entry(&wait, current);
         add_wait_queue(&runtime->sleep, &wait);
 #ifdef OSS_DEBUG
-        printk("sync1: size = %li\n", size);
+        printk(KERN_DEBUG "sync1: size = %li\n", size);
 #endif
         while (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)
                 mutex_lock(&runtime->oss.params_lock);
                 if (runtime->oss.buffer_used > 0) {
 #ifdef OSS_DEBUG
-                        printk("sync: buffer_used\n");
+                        printk(KERN_DEBUG "sync: buffer_used\n");
 #endif
                         size = (8 * (runtime->oss.period_bytes - runtime->oss.buffer_used) + 7) / width;
                         snd_pcm_format_set_silence(format,
@@ -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) {
 #ifdef OSS_DEBUG
-                        printk("sync: period_ptr\n");
+                        printk(KERN_DEBUG "sync: period_ptr\n");
 #endif
                         size = runtime->oss.period_bytes - runtime->oss.period_ptr;
                         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
         int err, cmd;
 
 #ifdef OSS_DEBUG
-        printk("pcm_oss: trigger = 0x%x\n", trigger);
+        printk(KERN_DEBUG "pcm_oss: trigger = 0x%x\n", trigger);
 #endif
         
         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
         }
 
 #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
         if (copy_to_user(_info, &info, sizeof(info)))
                 return -EFAULT;
@@ -2473,7 +2483,7 @@ static long snd_pcm_oss_ioctl(struct file *file, unsigned int cmd, unsigned long
         if (((cmd >> 8) & 0xff) != 'P')
                 return -EINVAL;
 #ifdef OSS_DEBUG
-        printk("pcm_oss: ioctl = 0x%x\n", cmd);
+        printk(KERN_DEBUG "pcm_oss: ioctl = 0x%x\n", cmd);
 #endif
         switch (cmd) {
         case SNDCTL_DSP_RESET:
@@ -2627,7 +2637,8 @@ static ssize_t snd_pcm_oss_read(struct file *file, char __user *buf, size_t coun
 #else
         {
                 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;
         }
 #endif
@@ -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;
         result = snd_pcm_oss_write1(substream, buf, count);
 #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
         return result;
 }
@@ -2720,7 +2732,7 @@ static int snd_pcm_oss_mmap(struct file *file, struct vm_area_struct *area)
         int err;
 
 #ifdef OSS_DEBUG
-        printk("pcm_oss: mmap begin\n");
+        printk(KERN_DEBUG "pcm_oss: mmap begin\n");
 #endif
         pcm_oss_file = file->private_data;
         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)
         runtime->silence_threshold = 0;
         runtime->silence_size = 0;
 #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
         /* In mmap mode we never stop */
         runtime->stop_threshold = runtime->boundary;
diff --git a/sound/core/oss/pcm_plugin.h b/sound/core/oss/pcm_plugin.h
index ca2f4c39be46..b9afab603711 100644
--- a/sound/core/oss/pcm_plugin.h
+++ b/sound/core/oss/pcm_plugin.h
@@ -176,9 +176,9 @@ static inline int snd_pcm_plug_slave_format(int format, struct snd_mask *format_
 #endif
 
 #ifdef PLUGIN_DEBUG
-#define pdprintf( fmt, args... ) printk( "plugin: " fmt, ##args)
+#define pdprintf(fmt, args...) printk(KERN_DEBUG "plugin: " fmt, ##args)
 #else
-#define pdprintf( fmt, args... ) 
+#define pdprintf(fmt, args...)
 #endif
 
 #endif                          /* __PCM_PLUGIN_H */
diff --git a/sound/core/pcm.c b/sound/core/pcm.c
index 37f567a68ef2..145931a9ff30 100644
--- a/sound/core/pcm.c
+++ b/sound/core/pcm.c
@@ -691,7 +691,7 @@ EXPORT_SYMBOL(snd_pcm_new_stream);
  *
  * Returns zero if successful, or a negative error code on failure.
  */
-int snd_pcm_new(struct snd_card *card, char *id, int device,
+int snd_pcm_new(struct snd_card *card, const char *id, int device,
                 int playback_count, int capture_count,
                 struct snd_pcm ** rpcm)
 {
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index a789efc9df39..d9b8f5379428 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -186,7 +186,7 @@ int snd_pcm_hw_refine(struct snd_pcm_substream *substream,
                 if (!(params->rmask & (1 << k)))
                         continue;
 #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]);
 #endif
                 changed = snd_mask_refine(m, constrs_mask(constrs, k));
@@ -206,7 +206,7 @@ int snd_pcm_hw_refine(struct snd_pcm_substream *substream,
                 if (!(params->rmask & (1 << k)))
                         continue;
 #ifdef RULES_DEBUG
-                printk("%s = ", snd_pcm_hw_param_names[k]);
+                printk(KERN_DEBUG "%s = ", snd_pcm_hw_param_names[k]);
                 if (i->empty)
                         printk("empty");
                 else
@@ -251,7 +251,7 @@ int snd_pcm_hw_refine(struct snd_pcm_substream *substream,
                         if (!doit)
                                 continue;
 #ifdef RULES_DEBUG
-                        printk("Rule %d [%p]: ", k, r->func);
+                        printk(KERN_DEBUG "Rule %d [%p]: ", k, r->func);
                         if (r->var >= 0) {
                                 printk("%s = ", snd_pcm_hw_param_names[r->var]);
                                 if (hw_is_mask(r->var)) {
diff --git a/sound/core/seq/oss/seq_oss_device.h b/sound/core/seq/oss/seq_oss_device.h
index bf8d2b4cb15e..c0154a959d55 100644
--- a/sound/core/seq/oss/seq_oss_device.h
+++ b/sound/core/seq/oss/seq_oss_device.h
@@ -181,7 +181,7 @@ char *enabled_str(int bool);
 /* for debug */
 #ifdef SNDRV_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
 #define debug_printk(x) /**/
 #endif
diff --git a/sound/core/seq/seq_prioq.c b/sound/core/seq/seq_prioq.c
index 0101a8b99b73..29896ab23403 100644
--- a/sound/core/seq/seq_prioq.c
+++ b/sound/core/seq/seq_prioq.c
@@ -321,7 +321,8 @@ void snd_seq_prioq_leave(struct snd_seq_prioq * f, int client, int timestamp)
                         freeprev = cell;
                 } else {
 #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.source.client,
                                 cell->event.dest.client,