Merge branch 'for-next' into for-linus

[karo-tx-linux.git] / sound / core / seq / oss / seq_oss.c

diff --git a/sound/core/seq/oss/seq_oss.c b/sound/core/seq/oss/seq_oss.c
index 8d4d5e853efec94716cf5585a94321c097144eb9..16d42679e43fc29e380612274e9f597f9899dc91 100644 (file)
--- a/sound/core/seq/oss/seq_oss.c
+++ b/sound/core/seq/oss/seq_oss.c
@@ -39,12 +39,6 @@ MODULE_LICENSE("GPL");
 MODULE_ALIAS_SNDRV_MINOR(SNDRV_MINOR_OSS_SEQUENCER);
 MODULE_ALIAS_SNDRV_MINOR(SNDRV_MINOR_OSS_MUSIC);
 
-#ifdef SNDRV_SEQ_OSS_DEBUG
-module_param(seq_oss_debug, int, 0644);
-MODULE_PARM_DESC(seq_oss_debug, "debug option");
-int seq_oss_debug = 0;
-#endif
-
 
 /*
  * prototypes
@@ -231,22 +225,19 @@ register_device(void)
        mutex_lock(&register_mutex);
        if ((rc = snd_register_oss_device(SNDRV_OSS_DEVICE_TYPE_SEQUENCER,
                                          NULL, 0,
-                                         &seq_oss_f_ops, NULL,
-                                         SNDRV_SEQ_OSS_DEVNAME)) < 0) {
-               snd_printk(KERN_ERR "can't register device seq\n");
+                                         &seq_oss_f_ops, NULL)) < 0) {
+               pr_err("ALSA: seq_oss: can't register device seq\n");
                mutex_unlock(&register_mutex);
                return rc;
        }
        if ((rc = snd_register_oss_device(SNDRV_OSS_DEVICE_TYPE_MUSIC,
                                          NULL, 0,
-                                         &seq_oss_f_ops, NULL,
-                                         SNDRV_SEQ_OSS_DEVNAME)) < 0) {
-               snd_printk(KERN_ERR "can't register device music\n");
+                                         &seq_oss_f_ops, NULL)) < 0) {
+               pr_err("ALSA: seq_oss: can't register device music\n");
                snd_unregister_oss_device(SNDRV_OSS_DEVICE_TYPE_SEQUENCER, NULL, 0);
                mutex_unlock(&register_mutex);
                return rc;
        }
-       debug_printk(("device registered\n"));
        mutex_unlock(&register_mutex);
        return 0;
 }
@@ -255,11 +246,10 @@ static void
 unregister_device(void)
 {
        mutex_lock(&register_mutex);
-       debug_printk(("device unregistered\n"));
        if (snd_unregister_oss_device(SNDRV_OSS_DEVICE_TYPE_MUSIC, NULL, 0) < 0)                
-               snd_printk(KERN_ERR "error unregister device music\n");
+               pr_err("ALSA: seq_oss: error unregister device music\n");
        if (snd_unregister_oss_device(SNDRV_OSS_DEVICE_TYPE_SEQUENCER, NULL, 0) < 0)
-               snd_printk(KERN_ERR "error unregister device seq\n");
+               pr_err("ALSA: seq_oss: error unregister device seq\n");
        mutex_unlock(&register_mutex);
 }