Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ALSA: timer: Use standard printk helpers

Use the standard pr_xxx() helpers instead of home-baked snd_print*().

Signed-off-by: Takashi Iwai <tiwai@suse.de>

+8 -11
+1 -2
sound/core/hrtimer.c
··· 126 126 127 127 hrtimer_get_res(CLOCK_MONOTONIC, &tp); 128 128 if (tp.tv_sec > 0 || !tp.tv_nsec) { 129 - snd_printk(KERN_ERR 130 - "snd-hrtimer: Invalid resolution %u.%09u", 129 + pr_err("snd-hrtimer: Invalid resolution %u.%09u", 131 130 (unsigned)tp.tv_sec, (unsigned)tp.tv_nsec); 132 131 return -EINVAL; 133 132 }
+1 -2
sound/core/rtctimer.c
··· 132 132 133 133 if (rtctimer_freq < 2 || rtctimer_freq > 8192 || 134 134 !is_power_of_2(rtctimer_freq)) { 135 - snd_printk(KERN_ERR "rtctimer: invalid frequency %d\n", 136 - rtctimer_freq); 135 + pr_err("ALSA: rtctimer: invalid frequency %d\n", rtctimer_freq); 137 136 return -EINVAL; 138 137 } 139 138
+6 -7
sound/core/timer.c
··· 240 240 /* open a slave instance */ 241 241 if (tid->dev_sclass <= SNDRV_TIMER_SCLASS_NONE || 242 242 tid->dev_sclass > SNDRV_TIMER_SCLASS_OSS_SEQUENCER) { 243 - snd_printd("invalid slave class %i\n", tid->dev_sclass); 243 + pr_debug("ALSA: timer: invalid slave class %i\n", 244 + tid->dev_sclass); 244 245 return -EINVAL; 245 246 } 246 247 mutex_lock(&register_mutex); ··· 775 774 *rtimer = NULL; 776 775 timer = kzalloc(sizeof(*timer), GFP_KERNEL); 777 776 if (timer == NULL) { 778 - snd_printk(KERN_ERR "timer: cannot allocate\n"); 777 + pr_err("ALSA: timer: cannot allocate\n"); 779 778 return -ENOMEM; 780 779 } 781 780 timer->tmr_class = tid->dev_class; ··· 814 813 if (! list_empty(&timer->open_list_head)) { 815 814 struct list_head *p, *n; 816 815 struct snd_timer_instance *ti; 817 - snd_printk(KERN_WARNING "timer %p is busy?\n", timer); 816 + pr_warn("ALSA: timer %p is busy?\n", timer); 818 817 list_for_each_safe(p, n, &timer->open_list_head) { 819 818 list_del_init(p); 820 819 ti = list_entry(p, struct snd_timer_instance, open_list); ··· 1956 1955 #endif 1957 1956 1958 1957 if ((err = snd_timer_register_system()) < 0) 1959 - snd_printk(KERN_ERR "unable to register system timer (%i)\n", 1960 - err); 1958 + pr_err("ALSA: unable to register system timer (%i)\n", err); 1961 1959 if ((err = snd_register_device(SNDRV_DEVICE_TYPE_TIMER, NULL, 0, 1962 1960 &snd_timer_f_ops, NULL, "timer")) < 0) 1963 - snd_printk(KERN_ERR "unable to register timer device (%i)\n", 1964 - err); 1961 + pr_err("ALSA: unable to register timer device (%i)\n", err); 1965 1962 snd_timer_proc_init(); 1966 1963 return 0; 1967 1964 }