Merge branch 'liblockdep-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / sound / core / timer.c

diff --git a/sound/core/timer.c b/sound/core/timer.c
index cbec51464c5bcefb98acd19171fa0125ca6e0605..cfd455a8ac1af366fb1ed63ae05497035b528b29 100644 (file)
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -240,7 +240,8 @@ int snd_timer_open(struct snd_timer_instance **ti,
                /* open a slave instance */
                if (tid->dev_sclass <= SNDRV_TIMER_SCLASS_NONE ||
                    tid->dev_sclass > SNDRV_TIMER_SCLASS_OSS_SEQUENCER) {
-                       snd_printd("invalid slave class %i\n", tid->dev_sclass);
+                       pr_debug("ALSA: timer: invalid slave class %i\n",
+                                tid->dev_sclass);
                        return -EINVAL;
                }
                mutex_lock(&register_mutex);
@@ -774,7 +775,7 @@ int snd_timer_new(struct snd_card *card, char *id, struct snd_timer_id *tid,
                *rtimer = NULL;
        timer = kzalloc(sizeof(*timer), GFP_KERNEL);
        if (timer == NULL) {
-               snd_printk(KERN_ERR "timer: cannot allocate\n");
+               pr_err("ALSA: timer: cannot allocate\n");
                return -ENOMEM;
        }
        timer->tmr_class = tid->dev_class;
@@ -813,7 +814,7 @@ static int snd_timer_free(struct snd_timer *timer)
        if (! list_empty(&timer->open_list_head)) {
                struct list_head *p, *n;
                struct snd_timer_instance *ti;
-               snd_printk(KERN_WARNING "timer %p is busy?\n", timer);
+               pr_warn("ALSA: timer %p is busy?\n", timer);
                list_for_each_safe(p, n, &timer->open_list_head) {
                        list_del_init(p);
                        ti = list_entry(p, struct snd_timer_instance, open_list);
@@ -1955,12 +1956,10 @@ static int __init alsa_timer_init(void)
 #endif
 
        if ((err = snd_timer_register_system()) < 0)
-               snd_printk(KERN_ERR "unable to register system timer (%i)\n",
-                          err);
+               pr_err("ALSA: unable to register system timer (%i)\n", err);
        if ((err = snd_register_device(SNDRV_DEVICE_TYPE_TIMER, NULL, 0,
                                       &snd_timer_f_ops, NULL, "timer")) < 0)
-               snd_printk(KERN_ERR "unable to register timer device (%i)\n",
-                          err);
+               pr_err("ALSA: unable to register timer device (%i)\n", err);
        snd_timer_proc_init();
        return 0;
 }