Use the standard pr_xxx() helpers instead of home-baked snd_print*().
Signed-off-by: Takashi Iwai <tiwai@suse.de>
 static struct snd_seq_client *clientptr(int clientid)
 {
        if (clientid < 0 || clientid >= SNDRV_SEQ_MAX_CLIENTS) {
-               snd_printd("Seq: oops. Trying to get pointer to client %d\n",
+               pr_debug("ALSA: seq: oops. Trying to get pointer to client %d\n",
                           clientid);
                return NULL;
        }
        struct snd_seq_client *client;
 
        if (clientid < 0 || clientid >= SNDRV_SEQ_MAX_CLIENTS) {
-               snd_printd("Seq: oops. Trying to get pointer to client %d\n",
+               pr_debug("ALSA: seq: oops. Trying to get pointer to client %d\n",
                           clientid);
                return NULL;
        }
        mutex_lock(®ister_mutex);
        switch (client->type) {
        case NO_CLIENT:
-               snd_printk(KERN_WARNING "Seq: Trying to free unused client %d\n",
-                          client->number);
+               pr_warn("ALSA: seq: Trying to free unused client %d\n",
+                       client->number);
                break;
        case USER_CLIENT:
        case KERNEL_CLIENT:
                break;
 
        default:
-               snd_printk(KERN_ERR "Seq: Trying to free client %d with undefined type = %d\n",
+               pr_err("ALSA: seq: Trying to free client %d with undefined type = %d\n",
                           client->number, client->type);
        }
        mutex_unlock(®ister_mutex);
 static int multicast_event(struct snd_seq_client *client, struct snd_seq_event *event,
                           int atomic, int hop)
 {
-       snd_printd("seq: multicast not supported yet.\n");
+       pr_debug("ALSA: seq: multicast not supported yet.\n");
        return 0; /* ignored */
 }
 #endif /* SUPPORT_BROADCAST */
 
        hop++;
        if (hop >= SNDRV_SEQ_MAX_HOPS) {
-               snd_printd("too long delivery path (%d:%d->%d:%d)\n",
+               pr_debug("ALSA: seq: too long delivery path (%d:%d->%d:%d)\n",
                           event->source.client, event->source.port,
                           event->dest.client, event->dest.port);
                return -EMLINK;
                if (p->cmd == cmd)
                        return p->func(client, arg);
        }
-       snd_printd("seq unknown ioctl() 0x%x (type='%c', number=0x%02x)\n",
+       pr_debug("ALSA: seq unknown ioctl() 0x%x (type='%c', number=0x%02x)\n",
                   cmd, _IOC_TYPE(cmd), _IOC_NR(cmd));
        return -ENOTTY;
 }
 
                return -ENOMEM;
        }
        if (ops->driver & DRIVER_LOADED) {
-               snd_printk(KERN_WARNING "driver_register: driver '%s' already exists\n", id);
+               pr_warn("ALSA: seq: driver_register: driver '%s' already exists\n", id);
                unlock_driver(ops);
                snd_seq_autoload_unlock();
                return -EBUSY;
                return -ENXIO;
        if (! (ops->driver & DRIVER_LOADED) ||
            (ops->driver & DRIVER_LOCKED)) {
-               snd_printk(KERN_ERR "driver_unregister: cannot unload driver '%s': status=%x\n",
+               pr_err("ALSA: seq: driver_unregister: cannot unload driver '%s': status=%x\n",
                           id, ops->driver);
                unlock_driver(ops);
                return -EBUSY;
 
        ops->driver = 0;
        if (ops->num_init_devices > 0)
-               snd_printk(KERN_ERR "free_driver: init_devices > 0!! (%d)\n",
+               pr_err("ALSA: seq: free_driver: init_devices > 0!! (%d)\n",
                           ops->num_init_devices);
        mutex_unlock(&ops->reg_mutex);
 
        if (dev->status != SNDRV_SEQ_DEVICE_FREE)
                return 0; /* already initialized */
        if (ops->argsize != dev->argsize) {
-               snd_printk(KERN_ERR "incompatible device '%s' for plug-in '%s' (%d %d)\n",
+               pr_err("ALSA: seq: incompatible device '%s' for plug-in '%s' (%d %d)\n",
                           dev->name, ops->id, ops->argsize, dev->argsize);
                return -EINVAL;
        }
                dev->status = SNDRV_SEQ_DEVICE_REGISTERED;
                ops->num_init_devices++;
        } else {
-               snd_printk(KERN_ERR "init_device failed: %s: %s\n",
+               pr_err("ALSA: seq: init_device failed: %s: %s\n",
                           dev->name, dev->id);
        }
 
        if (dev->status != SNDRV_SEQ_DEVICE_REGISTERED)
                return 0; /* not registered */
        if (ops->argsize != dev->argsize) {
-               snd_printk(KERN_ERR "incompatible device '%s' for plug-in '%s' (%d %d)\n",
+               pr_err("ALSA: seq: incompatible device '%s' for plug-in '%s' (%d %d)\n",
                           dev->name, ops->id, ops->argsize, dev->argsize);
                return -EINVAL;
        }
                dev->driver_data = NULL;
                ops->num_init_devices--;
        } else {
-               snd_printk(KERN_ERR "free_device failed: %s: %s\n",
+               pr_err("ALSA: seq: free_device failed: %s: %s\n",
                           dev->name, dev->id);
        }
 
        snd_info_free_entry(info_entry);
 #endif
        if (num_ops)
-               snd_printk(KERN_ERR "drivers not released (%d)\n", num_ops);
+               pr_err("ALSA: seq: drivers not released (%d)\n", num_ops);
 }
 
 module_init(alsa_seq_device_init)
 
        int i;
 
        if (ports < 1) {
-               snd_printk(KERN_ERR "invalid number of ports %d\n", ports);
+               pr_err("ALSA: seq_dummy: invalid number of ports %d\n", ports);
                return -EINVAL;
        }
 
 
 
        f = kzalloc(sizeof(*f), GFP_KERNEL);
        if (f == NULL) {
-               snd_printd("malloc failed for snd_seq_fifo_new() \n");
+               pr_debug("ALSA: seq: malloc failed for snd_seq_fifo_new() \n");
                return NULL;
        }
 
 
        int max_count = 5 * HZ;
 
        if (atomic_read(lockp) < 0) {
-               printk(KERN_WARNING "seq_lock: lock trouble [counter = %d] in %s:%d\n", atomic_read(lockp), file, line);
+               pr_warn("ALSA: seq_lock: lock trouble [counter = %d] in %s:%d\n", atomic_read(lockp), file, line);
                return;
        }
        while (atomic_read(lockp) > 0) {
                if (max_count == 0) {
-                       snd_printk(KERN_WARNING "seq_lock: timeout [%d left] in %s:%d\n", atomic_read(lockp), file, line);
+                       pr_warn("ALSA: seq_lock: timeout [%d left] in %s:%d\n", atomic_read(lockp), file, line);
                        break;
                }
                schedule_timeout_uninterruptible(1);
 
        init_waitqueue_entry(&wait, current);
        spin_lock_irqsave(&pool->lock, flags);
        if (pool->ptr == NULL) {        /* not initialized */
-               snd_printd("seq: pool is not initialized\n");
+               pr_debug("ALSA: seq: pool is not initialized\n");
                err = -EINVAL;
                goto __error;
        }
 
        pool->ptr = vmalloc(sizeof(struct snd_seq_event_cell) * pool->size);
        if (pool->ptr == NULL) {
-               snd_printd("seq: malloc for sequencer events failed\n");
+               pr_debug("ALSA: seq: malloc for sequencer events failed\n");
                return -ENOMEM;
        }
 
 
        while (atomic_read(&pool->counter) > 0) {
                if (max_count == 0) {
-                       snd_printk(KERN_WARNING "snd_seq_pool_done timeout: %d cells remain\n", atomic_read(&pool->counter));
+                       pr_warn("ALSA: snd_seq_pool_done timeout: %d cells remain\n", atomic_read(&pool->counter));
                        break;
                }
                schedule_timeout_uninterruptible(1);
        /* create pool block */
        pool = kzalloc(sizeof(*pool), GFP_KERNEL);
        if (pool == NULL) {
-               snd_printd("seq: malloc failed for pool\n");
+               pr_debug("ALSA: seq: malloc failed for pool\n");
                return NULL;
        }
        spin_lock_init(&pool->lock);
 
        runtime = substream->runtime;
        if ((tmp = runtime->avail) < count) {
                if (printk_ratelimit())
-                       snd_printk(KERN_ERR "MIDI output buffer overrun\n");
+                       pr_err("ALSA: seq_midi: MIDI output buffer overrun\n");
                return -ENOMEM;
        }
        if (snd_rawmidi_kernel_write(substream, buf, count) < count)
        if (ev->type == SNDRV_SEQ_EVENT_SYSEX) {        /* special case, to save space */
                if ((ev->flags & SNDRV_SEQ_EVENT_LENGTH_MASK) != SNDRV_SEQ_EVENT_LENGTH_VARIABLE) {
                        /* invalid event */
-                       snd_printd("seq_midi: invalid sysex event flags = 0x%x\n", ev->flags);
+                       pr_debug("ALSA: seq_midi: invalid sysex event flags = 0x%x\n", ev->flags);
                        return 0;
                }
                snd_seq_dump_var_event(ev, (snd_seq_dump_func_t)dump_midi, substream);
                                           msynth->subdevice,
                                           SNDRV_RAWMIDI_LFLG_INPUT,
                                           &msynth->input_rfile)) < 0) {
-               snd_printd("midi input open failed!!!\n");
+               pr_debug("ALSA: seq_midi: midi input open failed!!!\n");
                return err;
        }
        runtime = msynth->input_rfile.input->runtime;
                                           msynth->subdevice,
                                           SNDRV_RAWMIDI_LFLG_OUTPUT,
                                           &msynth->output_rfile)) < 0) {
-               snd_printd("midi output open failed!!!\n");
+               pr_debug("ALSA: seq_midi: midi output open failed!!!\n");
                return err;
        }
        memset(¶ms, 0, sizeof(params));
 
        int dest_channel = 0;
 
        if (ev == NULL || chanset == NULL) {
-               snd_printd("ev or chanbase NULL (snd_midi_process_event)\n");
+               pr_debug("ALSA: seq_midi_emul: ev or chanbase NULL (snd_midi_process_event)\n");
                return;
        }
        if (chanset->channels == NULL)
        if (snd_seq_ev_is_channel_type(ev)) {
                dest_channel = ev->data.note.channel;
                if (dest_channel >= chanset->max_channels) {
-                       snd_printd("dest channel is %d, max is %d\n",
+                       pr_debug("ALSA: seq_midi_emul: dest channel is %d, max is %d\n",
                                   dest_channel, chanset->max_channels);
                        return;
                }
        case SNDRV_SEQ_EVENT_ECHO:
        not_yet:
        default:
-               /*snd_printd("Unimplemented event %d\n", ev->type);*/
+               /*pr_debug("ALSA: seq_midi_emul: Unimplemented event %d\n", ev->type);*/
                break;
        }
 }
 
                return NULL;
 
        if (client->num_ports >= SNDRV_SEQ_MAX_PORTS - 1) {
-               snd_printk(KERN_WARNING "too many ports for client %d\n", client->number);
+               pr_warn("ALSA: seq: too many ports for client %d\n", client->number);
                return NULL;
        }
 
        /* create a new port */
        new_port = kzalloc(sizeof(*new_port), GFP_KERNEL);
        if (! new_port) {
-               snd_printd("malloc failed for registering client port\n");
+               pr_debug("ALSA: seq: malloc failed for registering client port\n");
                return NULL;    /* failure, out of memory */
        }
        /* init port data */
 
 
        f = kzalloc(sizeof(*f), GFP_KERNEL);
        if (f == NULL) {
-               snd_printd("oops: malloc failed for snd_seq_prioq_new()\n");
+               pr_debug("ALSA: seq: malloc failed for snd_seq_prioq_new()\n");
                return NULL;
        }
        
        *fifo = NULL;
 
        if (f == NULL) {
-               snd_printd("oops: snd_seq_prioq_delete() called with NULL prioq\n");
+               pr_debug("ALSA: seq: snd_seq_prioq_delete() called with NULL prioq\n");
                return;
        }
 
                cur = cur->next;
                if (! --count) {
                        spin_unlock_irqrestore(&f->lock, flags);
-                       snd_printk(KERN_ERR "cannot find a pointer.. infinite loop?\n");
+                       pr_err("ALSA: seq: cannot find a pointer.. infinite loop?\n");
                        return -EINVAL;
                }
        }
        unsigned long flags;
 
        if (f == NULL) {
-               snd_printd("oops: snd_seq_prioq_cell_in() called with NULL prioq\n");
+               pr_debug("ALSA: seq: snd_seq_prioq_cell_in() called with NULL prioq\n");
                return NULL;
        }
        spin_lock_irqsave(&f->lock, flags);
 int snd_seq_prioq_avail(struct snd_seq_prioq * f)
 {
        if (f == NULL) {
-               snd_printd("oops: snd_seq_prioq_cell_in() called with NULL prioq\n");
+               pr_debug("ALSA: seq: snd_seq_prioq_cell_in() called with NULL prioq\n");
                return 0;
        }
        return f->cells;
 struct snd_seq_event_cell *snd_seq_prioq_cell_peek(struct snd_seq_prioq * f)
 {
        if (f == NULL) {
-               snd_printd("oops: snd_seq_prioq_cell_in() called with NULL prioq\n");
+               pr_debug("ALSA: seq: snd_seq_prioq_cell_in() called with NULL prioq\n");
                return NULL;
        }
        return f->head;
                        freeprev = cell;
                } else {
 #if 0
-                       printk(KERN_DEBUG "type = %i, source = %i, dest = %i, "
+                       pr_debug("ALSA: seq: type = %i, source = %i, dest = %i, "
                               "client = %i\n",
                                cell->event.type,
                                cell->event.source.client,
 
 
        q = kzalloc(sizeof(*q), GFP_KERNEL);
        if (q == NULL) {
-               snd_printd("malloc failed for snd_seq_queue_new()\n");
+               pr_debug("ALSA: seq: malloc failed for snd_seq_queue_new()\n");
                return NULL;
        }
 
 
        
        tmr = kzalloc(sizeof(*tmr), GFP_KERNEL);
        if (tmr == NULL) {
-               snd_printd("malloc failed for snd_seq_timer_new() \n");
+               pr_debug("ALSA: seq: malloc failed for snd_seq_timer_new() \n");
                return NULL;
        }
        spin_lock_init(&tmr->lock);
        *tmr = NULL;
 
        if (t == NULL) {
-               snd_printd("oops: snd_seq_timer_delete() called with NULL timer\n");
+               pr_debug("ALSA: seq: snd_seq_timer_delete() called with NULL timer\n");
                return;
        }
        t->running = 0;
                /* refuse to change ppq on running timers */
                /* because it will upset the song position (ticks) */
                spin_unlock_irqrestore(&tmr->lock, flags);
-               snd_printd("seq: cannot change ppq of a running timer\n");
+               pr_debug("ALSA: seq: cannot change ppq of a running timer\n");
                return -EBUSY;
        }
 
 
        /* FIXME */
        if (base != SKEW_BASE) {
-               snd_printd("invalid skew base 0x%x\n", base);
+               pr_debug("ALSA: seq: invalid skew base 0x%x\n", base);
                return -EINVAL;
        }
        spin_lock_irqsave(&tmr->lock, flags);
                }
        }
        if (err < 0) {
-               snd_printk(KERN_ERR "seq fatal error: cannot create timer (%i)\n", err);
+               pr_err("ALSA: seq fatal error: cannot create timer (%i)\n", err);
                return err;
        }
        t->callback = snd_seq_timer_interrupt;
 
                /* should check presence of port more strictly.. */
                break;
        default:
-               snd_printk(KERN_ERR "seq_mode is not set: %d\n", rdev->seq_mode);
+               pr_err("ALSA: seq_virmidi: seq_mode is not set: %d\n", rdev->seq_mode);
                return -EINVAL;
        }
        return 0;