Use standard printk helpers for ALSA core codes
cover Use standard printk helpers for ALSA core codes
OK, this is the last batch. This series converts the use of snd_printk() and co with the standard ones like dev_err() in ALSA core codes. This became possible now by the new card device management.
Takashi
PATCH 1/10 ALSA: seq_oss: Drop debug prints
The debug prints in snd-seq-oss module are rather useless. Let's clean up before further modifications.
--- sound/core/seq/oss/seq_oss.c | 8 -------- sound/core/seq/oss/seq_oss_device.h | 12 ------------ sound/core/seq/oss/seq_oss_init.c | 17 ----------------- sound/core/seq/oss/seq_oss_ioctl.c | 18 ------------------ sound/core/seq/oss/seq_oss_midi.c | 3 --- sound/core/seq/oss/seq_oss_synth.c | 3 --- sound/core/seq/oss/seq_oss_timer.c | 7 ------- 7 files changed, 68 deletions(-)
sound/core/seq/oss/seq_oss.c +0 -8
@@ -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
@@ -244,7 +238,6 @@ register_device(void)mutex_unlock (®ister_mutex);return rc; } -debug_printk (("device registered\n" ));mutex_unlock (®ister_mutex);return 0 ; }
@@ -253,7 +246,6 @@ static voidunregister_device (void) {mutex_lock (®ister_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" );if (snd_unregister_oss_device (SNDRV_OSS_DEVICE_TYPE_SEQUENCER ,NULL ,0 ) <0 )
sound/core/seq/oss/seq_oss_device.h +0 -12
@@ -31,9 +31,6 @@#include <sound/seq_kernel.h> #include <sound/info.h> -/* enable debug print */ -#define SNDRV_SEQ_OSS_DEBUG -/* max. applications */ #define SNDRV_SEQ_OSS_MAX_CLIENTS 16#define SNDRV_SEQ_OSS_MAX_SYNTH_DEVS 16
@@ -176,13 +173,4 @@ snd_seq_oss_fill_addr(struct seq_oss_devinfo *dp, struct snd_seq_event *ev,/* misc. functions for proc interface */ 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_printd x; } while (0) -#else -#define debug_printk (x)/**/ -#endif -#endif /* __SEQ_OSS_DEVICE_H */
sound/core/seq/oss/seq_oss_init.c +0 -17
@@ -92,7 +92,6 @@ snd_seq_oss_create_client(void) goto __error; system_client = rc; -debug_printk (("new client = %d\n" , rc));/* create annoucement receiver port */ memset (port,0 ,sizeof (*port));
@@ -193,7 +192,6 @@ snd_seq_oss_open(struct file *file, int level)snd_printk (KERN_ERR "can't malloc device info\n" );return -ENOMEM ; } -debug_printk (("oss_open: dp = %p\n" , dp)); dp->cseq = system_client; dp->port =-1 ;
@@ -222,7 +220,6 @@ snd_seq_oss_open(struct file *file, int level) }/* create port */ -debug_printk (("create new port\n" )); rc =create_port (dp);if (rc <0 ) {snd_printk (KERN_ERR "can't create port\n" );
@@ -230,7 +227,6 @@ snd_seq_oss_open(struct file *file, int level) }/* allocate queue */ -debug_printk (("allocate queue\n" )); rc =alloc_seq_queue (dp);if (rc <0 ) goto _error;
@@ -247,7 +243,6 @@ snd_seq_oss_open(struct file *file, int level) dp->file_mode =translate_mode (file);/* initialize read queue */ -debug_printk (("initialize read queue\n" ));if (is_read_mode (dp->file_mode)) { dp->readq =snd_seq_oss_readq_new (dp, maxqlen);if (!dp->readq) {
@@ -257,7 +252,6 @@ snd_seq_oss_open(struct file *file, int level) }/* initialize write queue */ -debug_printk (("initialize write queue\n" ));if (is_write_mode (dp->file_mode)) { dp->writeq =snd_seq_oss_writeq_new (dp, maxqlen);if (!dp->writeq) {
@@ -267,14 +261,12 @@ snd_seq_oss_open(struct file *file, int level) }/* initialize timer */ -debug_printk (("initialize timer\n" )); dp->timer =snd_seq_oss_timer_new (dp);if (!dp->timer) {snd_printk (KERN_ERR "can't alloc timer\n" ); rc = -ENOMEM ; goto _error; } -debug_printk (("timer initialized\n" ));/* set private data pointer */ file->private_data = dp;
@@ -288,7 +280,6 @@ snd_seq_oss_open(struct file *file, int level) client_table[dp->index] = dp; num_clients++; -debug_printk (("open done\n" ));return 0 ; _error:
@@ -347,7 +338,6 @@ create_port(struct seq_oss_devinfo *dp)return rc; dp->port = port.addr.port; -debug_printk (("new port = %d\n" , port.addr.port));return 0 ; }
@@ -363,7 +353,6 @@ delete_port(struct seq_oss_devinfo *dp)return 0 ; } -debug_printk (("delete_port %i\n" , dp->port));return snd_seq_event_port_detach (dp->cseq, dp->port); }
@@ -438,21 +427,16 @@ snd_seq_oss_release(struct seq_oss_devinfo *dp) client_table[dp->index] =NULL ; num_clients--; -debug_printk (("resetting..\n" ));snd_seq_oss_reset (dp); -debug_printk (("cleaning up..\n" ));snd_seq_oss_synth_cleanup (dp);snd_seq_oss_midi_cleanup (dp);/* clear slot */ -debug_printk (("releasing resource..\n" )); queue = dp->queue;if (dp->port >=0 )delete_port (dp);delete_seq_queue (queue); - -debug_printk (("release done\n" )); }
@@ -466,7 +450,6 @@ snd_seq_oss_drain_write(struct seq_oss_devinfo *dp)return ;if (is_write_mode (dp->file_mode) && !is_nonblock_mode (dp->file_mode) && dp->writeq) { -debug_printk (("syncing..\n" ));while (snd_seq_oss_writeq_sync (dp->writeq)) ; }
sound/core/seq/oss/seq_oss_ioctl.c +0 -18
@@ -90,12 +90,10 @@ snd_seq_oss_ioctl(struct seq_oss_devinfo *dp, unsigned int cmd, unsigned long careturn snd_seq_oss_timer_ioctl (dp->timer, cmd, arg);case SNDCTL_SEQ_PANIC : -debug_printk (("panic\n" ));snd_seq_oss_reset (dp);return -EINVAL ;case SNDCTL_SEQ_SYNC : -debug_printk (("sync\n" ));if (!is_write_mode (dp->file_mode) || dp->writeq ==NULL )return 0 ;while (snd_seq_oss_writeq_sync (dp->writeq))
@@ -105,55 +103,45 @@ snd_seq_oss_ioctl(struct seq_oss_devinfo *dp, unsigned int cmd, unsigned long careturn 0 ;case SNDCTL_SEQ_RESET : -debug_printk (("reset\n" ));snd_seq_oss_reset (dp);return 0 ;case SNDCTL_SEQ_TESTMIDI : -debug_printk (("test midi\n" ));if (get_user (dev, p))return -EFAULT ;return snd_seq_oss_midi_open (dp, dev, dp->file_mode);case SNDCTL_SEQ_GETINCOUNT : -debug_printk (("get in count\n" ));if (dp->readq ==NULL || !is_read_mode (dp->file_mode))return 0 ;return put_user (dp->readq->qlen, p) ? -EFAULT :0 ;case SNDCTL_SEQ_GETOUTCOUNT : -debug_printk (("get out count\n" ));if (!is_write_mode (dp->file_mode) || dp->writeq ==NULL )return 0 ;return put_user (snd_seq_oss_writeq_get_free_size (dp->writeq), p) ? -EFAULT :0 ;case SNDCTL_SEQ_GETTIME : -debug_printk (("get time\n" ));return put_user (snd_seq_oss_timer_cur_tick (dp->timer), p) ? -EFAULT :0 ;case SNDCTL_SEQ_RESETSAMPLES : -debug_printk (("reset samples\n" ));if (get_user (dev, p))return -EFAULT ;return snd_seq_oss_synth_ioctl (dp, dev, cmd, carg);case SNDCTL_SEQ_NRSYNTHS : -debug_printk (("nr synths\n" ));return put_user (dp->max_synthdev, p) ? -EFAULT :0 ;case SNDCTL_SEQ_NRMIDIS : -debug_printk (("nr midis\n" ));return put_user (dp->max_mididev, p) ? -EFAULT :0 ;case SNDCTL_SYNTH_MEMAVL : -debug_printk (("mem avail\n" ));if (get_user (dev, p))return -EFAULT ; val =snd_seq_oss_synth_ioctl (dp, dev, cmd, carg);return put_user (val, p) ? -EFAULT :0 ;case SNDCTL_FM_4OP_ENABLE : -debug_printk (("4op\n" ));if (get_user (dev, p))return -EFAULT ;snd_seq_oss_synth_ioctl (dp, dev, cmd, carg);
@@ -161,19 +149,15 @@ snd_seq_oss_ioctl(struct seq_oss_devinfo *dp, unsigned int cmd, unsigned long cacase SNDCTL_SYNTH_INFO :case SNDCTL_SYNTH_ID : -debug_printk (("synth info\n" ));return snd_seq_oss_synth_info_user (dp, arg);case SNDCTL_SEQ_OUTOFBAND : -debug_printk (("out of band\n" ));return snd_seq_oss_oob_user (dp, arg);case SNDCTL_MIDI_INFO : -debug_printk (("midi info\n" ));return snd_seq_oss_midi_info_user (dp, arg);case SNDCTL_SEQ_THRESHOLD : -debug_printk (("threshold\n" ));if (!is_write_mode (dp->file_mode))return 0 ;if (get_user (val, p))
@@ -186,7 +170,6 @@ snd_seq_oss_ioctl(struct seq_oss_devinfo *dp, unsigned int cmd, unsigned long careturn 0 ;case SNDCTL_MIDI_PRETIME : -debug_printk (("pretime\n" ));if (dp->readq ==NULL || !is_read_mode (dp->file_mode))return 0 ;if (get_user (val, p))
@@ -199,7 +182,6 @@ snd_seq_oss_ioctl(struct seq_oss_devinfo *dp, unsigned int cmd, unsigned long careturn put_user (val, p) ? -EFAULT :0 ;default : -debug_printk (("others\n" ));if (!is_write_mode (dp->file_mode))return -EIO ;return snd_seq_oss_synth_ioctl (dp,0 , cmd, carg);
sound/core/seq/oss/seq_oss_midi.c +0 -3
@@ -153,7 +153,6 @@ snd_seq_oss_midi_check_new_port(struct snd_seq_port_info *pinfo)struct seq_oss_midi *mdev;unsigned long flags; -debug_printk (("check for MIDI client %d port %d\n" , pinfo->addr.client, pinfo->addr.port));/* the port must include generic midi */ if (! (pinfo->type &SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC ))return 0 ;
@@ -406,7 +405,6 @@ snd_seq_oss_midi_close(struct seq_oss_devinfo *dp, int dev)return 0 ; } -debug_printk (("closing client %d port %d mode %d\n" , mdev->client, mdev->port, mdev->opened));memset (&subs,0 ,sizeof (subs));if (mdev->opened &PERM_WRITE ) { subs.sender = dp->addr;
@@ -470,7 +468,6 @@ snd_seq_oss_midi_reset(struct seq_oss_devinfo *dp, int dev)struct snd_seq_event ev;int c; -debug_printk (("resetting client %d port %d\n" , mdev->client, mdev->port));memset (&ev,0 ,sizeof (ev)); ev.dest.client = mdev->client; ev.dest.port = mdev->port;
sound/core/seq/oss/seq_oss_synth.c +0 -3
@@ -138,7 +138,6 @@ snd_seq_oss_synth_register(struct snd_seq_device *dev) } rec->seq_device = i; synth_devs[i] = rec; -debug_printk (("synth %s registered %d\n" , rec->name, i));spin_unlock_irqrestore (®ister_lock, flags); dev->driver_data = rec;#ifdef SNDRV_OSS_INFO_DEV_SYNTH
@@ -256,7 +255,6 @@ snd_seq_oss_synth_setup(struct seq_oss_devinfo *dp) }reset_channels (info); } -debug_printk (("synth %d assigned\n" , i)); info->opened++; rec->opened++; dp->synth_opened++;
@@ -326,7 +324,6 @@ snd_seq_oss_synth_cleanup(struct seq_oss_devinfo *dp)if (rec ==NULL )continue ;if (rec->opened >0 ) { -debug_printk (("synth %d closed\n" , i)); rec->oper.close (&info->arg);module_put (rec->oper.owner); rec->opened =0 ;
sound/core/seq/oss/seq_oss_timer.c +0 -7
@@ -233,7 +233,6 @@ snd_seq_oss_timer_ioctl(struct seq_oss_timer *timer, unsigned int cmd, int __useint value;if (cmd ==SNDCTL_SEQ_CTRLRATE ) { -debug_printk (("ctrl rate\n" ));/* if *arg == 0, just return the current rate */ if (get_user (value, arg))return -EFAULT ;
@@ -248,21 +247,16 @@ snd_seq_oss_timer_ioctl(struct seq_oss_timer *timer, unsigned int cmd, int __useswitch (cmd) {case SNDCTL_TMR_START : -debug_printk (("timer start\n" ));return snd_seq_oss_timer_start (timer);case SNDCTL_TMR_STOP : -debug_printk (("timer stop\n" ));return snd_seq_oss_timer_stop (timer);case SNDCTL_TMR_CONTINUE : -debug_printk (("timer continue\n" ));return snd_seq_oss_timer_continue (timer);case SNDCTL_TMR_TEMPO : -debug_printk (("timer tempo\n" ));if (get_user (value, arg))return -EFAULT ;return snd_seq_oss_timer_tempo (timer, value);case SNDCTL_TMR_TIMEBASE : -debug_printk (("timer timebase\n" ));if (get_user (value, arg))return -EFAULT ;if (value <MIN_OSS_TIMEBASE )
@@ -276,7 +270,6 @@ snd_seq_oss_timer_ioctl(struct seq_oss_timer *timer, unsigned int cmd, int __usecase SNDCTL_TMR_METRONOME :case SNDCTL_TMR_SELECT :case SNDCTL_TMR_SOURCE : -debug_printk (("timer XXX\n" ));/* not supported */ return 0 ; }
Signature · 1 line
1.8.5.2
PATCH 2/10 ALSA: control: Use standard printk helpers
In reply to Takashi IwaiUse dev_err() & co as much as possible. If not available (no device assigned at the calling point), use pr_xxx() helpers instead.
--- sound/core/control.c | 15 +++++++-------- sound/core/control_compat.c | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-)
sound/core/control.c +7 -8
@@ -170,7 +170,7 @@ void snd_ctl_notify(struct snd_card *card, unsigned int mask, ev->mask = mask;list_add_tail (&ev->list, &ctl->events); }else { -snd_printk (KERN_ERR "No memory available to allocate event\n" ); +dev_err (card->dev,"No memory available to allocate event\n" ); } _found:wake_up (&ctl->change_sleep);
@@ -206,7 +206,7 @@ static struct snd_kcontrol *snd_ctl_new(struct snd_kcontrol *control, kctl =kzalloc (sizeof (*kctl) +sizeof (struct snd_kcontrol_volatile ) * control->count,GFP_KERNEL );if (kctl ==NULL ) { -snd_printk (KERN_ERR "Cannot allocate control instance\n" ); +pr_err ("ALSA: Cannot allocate control instance\n" );return NULL ; } *kctl = *control;
@@ -241,9 +241,8 @@ struct snd_kcontrol *snd_ctl_new1(const struct snd_kcontrol_new *ncontrol,if (ncontrol->name) {strlcpy (kctl.id.name, ncontrol->name,sizeof (kctl.id.name));if (strcmp (ncontrol->name, kctl.id.name) !=0 ) -snd_printk (KERN_WARNING -"Control name '%s' truncated to '%s'\n" , - ncontrol->name, kctl.id.name); +pr_warn ("ALSA: Control name '%s' truncated to '%s'\n" , + ncontrol->name, kctl.id.name); } kctl.id.index = ncontrol->index; kctl.count = ncontrol->count ? ncontrol->count :1 ;
@@ -306,7 +305,7 @@ static int snd_ctl_find_hole(struct snd_card *card, unsigned int count)while (snd_ctl_remove_numid_conflict (card, count)) {if (--iter ==0 ) {/* this situation is very unlikely */ -snd_printk (KERN_ERR "unable to allocate new control numid\n" ); +dev_err (card->dev,"unable to allocate new control numid\n" );return -ENOMEM ; } }
@@ -341,7 +340,7 @@ int snd_ctl_add(struct snd_card *card, struct snd_kcontrol *kcontrol)down_write (&card->controls_rwsem);if (snd_ctl_find_id (card, &id)) {up_write (&card->controls_rwsem); - snd_printd(KERN_ERR "control %i:%i:%i:%s:%i is already present\n", + dev_err(card->dev, "control %i:%i:%i:%s:%i is already present\n", id.iface, id.device, id.subdevice,
@@ -1406,7 +1405,7 @@ static long snd_ctl_ioctl(struct file *file, unsigned int cmd, unsigned long arg } }up_read (&snd_ioctl_rwsem); -snd_printdd ("unknown ioctl = 0x%x\n" , cmd); +dev_dbg (card->dev,"unknown ioctl = 0x%x\n" , cmd);return -ENOTTY ; }
sound/core/control_compat.c +1 -1
@@ -247,7 +247,7 @@ static int copy_ctl_value_from_user(struct snd_card *card, }else { size =get_elem_size (type, count);if (size <0 ) { -printk (KERN_ERR "snd_ioctl32_ctl_elem_value: unknown type %d\n" , type); +dev_err (card->dev,"snd_ioctl32_ctl_elem_value: unknown type %d\n" , type);return -EINVAL ; } if (copy_from_user(data->value.bytes.data,
Signature · 1 line
1.8.5.2
PATCH 3/10 ALSA: control: Use standard printk helpers
In reply to Takashi IwaiUse dev_err() & co as much as possible. If not available (no device assigned at the calling point), use pr_xxx() helpers instead.
For simplicity, introduce new helpers for pcm stream, pcm_err(), etc.
--- include/sound/pcm.h | 8 ++++++++ sound/core/pcm.c | 12 +++++++----- sound/core/pcm_lib.c | 27 +++++++++++++-------------- sound/core/pcm_native.c | 47 ++++++++++++++++++++++++----------------------- sound/core/pcm_timer.c | 4 +++- 5 files changed, 55 insertions(+), 43 deletions(-)
include/sound/pcm.h +8 -0
@@ -1141,4 +1141,12 @@ static inline u64 pcm_format_to_bits(snd_pcm_format_t pcm_format) return 1ULL << (__force int) pcm_format; } +/* printk helpers */ +#define pcm_err(pcm, fmt, args...) \ + dev_err((pcm)->card->dev, fmt, ##args) +#define pcm_warn(pcm, fmt, args...) \ + dev_warn((pcm)->card->dev, fmt, ##args) +#define pcm_dbg(pcm, fmt, args...) \ + dev_dbg((pcm)->card->dev, fmt, ##args) +#endif /* __SOUND_PCM_H */
sound/core/pcm.c +7 -5
@@ -338,7 +338,8 @@ static void snd_pcm_proc_info_read(struct snd_pcm_substream *substream, info =kmalloc (sizeof (*info),GFP_KERNEL );if (! info) { -printk (KERN_DEBUG "snd_pcm_proc_info_read: cannot malloc\n" ); +pcm_dbg (substream->pcm, +"snd_pcm_proc_info_read: cannot malloc\n" );return ; }
@@ -660,7 +661,7 @@ int snd_pcm_new_stream(struct snd_pcm *pcm, int stream, int substream_count)if (substream_count >0 && !pcm->internal) { err =snd_pcm_stream_proc_init (pstr);if (err <0 ) { -snd_printk (KERN_ERR "Error in snd_pcm_stream_proc_init\n" ); +pcm_err (pcm,"Error in snd_pcm_stream_proc_init\n" );return err; } }
@@ -668,7 +669,7 @@ int snd_pcm_new_stream(struct snd_pcm *pcm, int stream, int substream_count)for (idx =0 , prev =NULL ; idx < substream_count; idx++) { substream =kzalloc (sizeof (*substream),GFP_KERNEL );if (substream ==NULL ) { -snd_printk (KERN_ERR "Cannot allocate PCM substream\n" ); +pcm_err (pcm,"Cannot allocate PCM substream\n" );return -ENOMEM ; } substream->pcm = pcm;
@@ -685,7 +686,8 @@ int snd_pcm_new_stream(struct snd_pcm *pcm, int stream, int substream_count)if (!pcm->internal) { err =snd_pcm_substream_proc_init (substream);if (err <0 ) { -snd_printk (KERN_ERR "Error in snd_pcm_stream_proc_init\n" ); +pcm_err (pcm, +"Error in snd_pcm_stream_proc_init\n" );if (prev ==NULL ) pstr->substream =NULL ;else
@@ -724,7 +726,7 @@ static int _snd_pcm_new(struct snd_card *card, const char *id, int device, *rpcm =NULL ; pcm =kzalloc (sizeof (*pcm),GFP_KERNEL );if (pcm ==NULL ) { -snd_printk (KERN_ERR "Cannot allocate PCM\n" ); +dev_err (card->dev,"Cannot allocate PCM\n" );return -ENOMEM ; } pcm->card = card;
sound/core/pcm_lib.c +13 -14
@@ -174,7 +174,7 @@ static void xrun(struct snd_pcm_substream *substream)if (xrun_debug (substream,XRUN_DEBUG_BASIC )) {char name[16 ];snd_pcm_debug_name (substream, name,sizeof (name)); -snd_printd (KERN_DEBUG "XRUN: %s\n" , name); +pcm_warn (substream->pcm,"XRUN: %s\n" , name);dump_stack_on_xrun (substream); } }
@@ -184,9 +184,7 @@ static void xrun(struct snd_pcm_substream *substream)do { \if (xrun_debug (substream,XRUN_DEBUG_BASIC )) { \xrun_log_show (substream); \ -if (snd_printd_ratelimit ()) { \ - snd_printd("PCM: " fmt, ##args); \ - } \ + pr_err_ratelimited("ALSA: PCM: " fmt, ##args); \dump_stack_on_xrun (substream); \ } \ }while (0 )
@@ -253,7 +251,7 @@ static void xrun_log_show(struct snd_pcm_substream *substream) entry = &log->entries[idx];if (entry->period_size ==0 )break ; - snd_printd("hwptr log: %s: %sj=%lu, pos=%ld/%ld/%ld, " + pr_info("hwptr log: %s: %sj=%lu, pos=%ld/%ld/%ld, " "hwptr=%ld/%ld\n", name, entry->in_interrupt ? "[Q] " : "", entry->jiffies,
@@ -342,14 +340,14 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,return -EPIPE ; }if (pos >= runtime->buffer_size) { -if (snd_printd_ratelimit ()) { +if (printk_ratelimit ()) {char name[16 ];snd_pcm_debug_name (substream, name,sizeof (name));xrun_log_show (substream); -snd_printd (KERN_ERR "BUG: %s, pos = %ld, " -"buffer size = %ld, period size = %ld\n" , - name, pos, runtime->buffer_size, - runtime->period_size); +pcm_err (substream->pcm, +"BUG: %s, pos = %ld, buffer size = %ld, period size = %ld\n" , + name, pos, runtime->buffer_size, + runtime->period_size); } pos =0 ; }
@@ -394,8 +392,8 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream, XRUN_DEBUG_PERIODUPDATE : XRUN_DEBUG_HWPTRUPDATE)) {char name[16 ];snd_pcm_debug_name (substream, name,sizeof (name)); - snd_printd("%s_update: %s: pos=%u/%u/%u, " - "hwptr=%ld/%ld/%ld/%ld\n", + pcm_dbg(substream->pcm, + "%s_update: %s: pos=%u/%u/%u, hwptr=%ld/%ld/%ld/%ld\n", in_interrupt ? "period" : "hwptr", name, (unsigned int)pos,
@@ -1941,8 +1939,9 @@ static int wait_for_avail(struct snd_pcm_substream *substream,continue ; }if (!tout) { -snd_printd ("%s write error (DMA or IRQ trouble?)\n" , - is_playback ?"playback" :"capture" ); +pcm_dbg (substream->pcm, +"%s write error (DMA or IRQ trouble?)\n" , + is_playback ?"playback" :"capture" ); err = -EIO ;break ; }
sound/core/pcm_native.c +24 -23
122 lines not on this page · raw message
sound/core/pcm_timer.c +3 -1
@@ -53,7 +53,9 @@ void snd_pcm_timer_resolution_change(struct snd_pcm_substream *substream) post *=2 ; }if (rate ==0 ) { -snd_printk (KERN_ERR "pcm timer resolution out of range (rate = %u, period_size = %lu)\n" , runtime->rate, runtime->period_size); +pcm_err (substream->pcm, +"pcm timer resolution out of range (rate = %u, period_size = %lu)\n" , + runtime->rate, runtime->period_size); runtime->timer_resolution =-1 ;return ; }
Signature · 1 line
1.8.5.2
Re: [PATCH 03/10] ALSA: control: Use standard printk helpers
At Wed, 12 Feb 2014 12:33:05 +0100,
Quoted 7 lines · Takashi Iwai
Use
dev_err()& co as much as possible. If not available (no device assigned at the calling point), usepr_xxx()helpers instead.For simplicity, introduce new helpers for pcm stream,
pcm_err(), etc.Signed-off-by Takashi Iwai <[email protected]>
The subject should be "pcm" instead of "control". Fixed in git tree topic/snd-card-dev branch.
Takashi
Quoted 309 lines
--- include/sound/pcm.h | 8 ++++++++ sound/core/pcm.c | 12 +++++++----- sound/core/pcm_lib.c | 27 +++++++++++++-------------- sound/core/pcm_native.c | 47 ++++++++++++++++++++++++----------------------- sound/core/pcm_timer.c | 4 +++- 5 files changed, 55 insertions(+), 43 deletions(-)include/sound/pcm.h +8
-0@@ -1141,4 +1141,12 @@ static inline u64 pcm_format_to_bits(snd_pcm_format_t pcm_format) return 1ULL << (__force int) pcm_format; } +/* printk helpers */ +#define pcm_err(pcm, fmt, args...) \ + dev_err((pcm)->card->dev, fmt, ##args) +#define pcm_warn(pcm, fmt, args...) \ + dev_warn((pcm)->card->dev, fmt, ##args) +#define pcm_dbg(pcm, fmt, args...) \ + dev_dbg((pcm)->card->dev, fmt, ##args) +#endif /* __SOUND_PCM_H */ sound/core/pcm.c +7
-5@@ -338,7 +338,8 @@ static void snd_pcm_proc_info_read(struct snd_pcm_substream *substream, info =kmalloc (sizeof (*info),GFP_KERNEL );if (! info) { -printk (KERN_DEBUG "snd_pcm_proc_info_read: cannot malloc\n" ); +pcm_dbg (substream->pcm, +"snd_pcm_proc_info_read: cannot malloc\n" );return ; }@@ -660,7 +661,7 @@ int snd_pcm_new_stream(struct snd_pcm *pcm, int stream, int substream_count)if (substream_count >0 && !pcm->internal) { err =snd_pcm_stream_proc_init (pstr);if (err <0 ) { -snd_printk (KERN_ERR "Error in snd_pcm_stream_proc_init\n" ); +pcm_err (pcm,"Error in snd_pcm_stream_proc_init\n" );return err; } }@@ -668,7 +669,7 @@ int snd_pcm_new_stream(struct snd_pcm *pcm, int stream, int substream_count)for (idx =0 , prev =NULL ; idx < substream_count; idx++) { substream =kzalloc (sizeof (*substream),GFP_KERNEL );if (substream ==NULL ) { -snd_printk (KERN_ERR "Cannot allocate PCM substream\n" ); +pcm_err (pcm,"Cannot allocate PCM substream\n" );return -ENOMEM ; } substream->pcm = pcm;@@ -685,7 +686,8 @@ int snd_pcm_new_stream(struct snd_pcm *pcm, int stream, int substream_count)if (!pcm->internal) { err =snd_pcm_substream_proc_init (substream);if (err <0 ) { -snd_printk (KERN_ERR "Error in snd_pcm_stream_proc_init\n" ); +pcm_err (pcm, +"Error in snd_pcm_stream_proc_init\n" );if (prev ==NULL ) pstr->substream =NULL ;else @@ -724,7 +726,7 @@ static int _snd_pcm_new(struct snd_card *card, const char *id, int device, *rpcm =NULL ; pcm =kzalloc (sizeof (*pcm),GFP_KERNEL );if (pcm ==NULL ) { -snd_printk (KERN_ERR "Cannot allocate PCM\n" ); +dev_err (card->dev,"Cannot allocate PCM\n" );return -ENOMEM ; } pcm->card = card;sound/core/pcm_lib.c +13
-14@@ -174,7 +174,7 @@ static void xrun(struct snd_pcm_substream *substream)if (xrun_debug (substream,XRUN_DEBUG_BASIC )) {char name[16 ];snd_pcm_debug_name (substream, name,sizeof (name)); -snd_printd (KERN_DEBUG "XRUN: %s\n" , name); +pcm_warn (substream->pcm,"XRUN: %s\n" , name);dump_stack_on_xrun (substream); } }@@ -184,9 +184,7 @@ static void xrun(struct snd_pcm_substream *substream)do { \if (xrun_debug (substream,XRUN_DEBUG_BASIC )) { \xrun_log_show (substream); \ -if (snd_printd_ratelimit ()) { \ - snd_printd("PCM: " fmt, ##args); \ - } \ + pr_err_ratelimited("ALSA: PCM: " fmt, ##args); \dump_stack_on_xrun (substream); \ } \ }while (0 )@@ -253,7 +251,7 @@ static void xrun_log_show(struct snd_pcm_substream *substream) entry = &log->entries[idx];if (entry->period_size ==0 )break ; - snd_printd("hwptr log: %s: %sj=%lu, pos=%ld/%ld/%ld, " + pr_info("hwptr log: %s: %sj=%lu, pos=%ld/%ld/%ld, " "hwptr=%ld/%ld\n", name, entry->in_interrupt ? "[Q] " : "", entry->jiffies,@@ -342,14 +340,14 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,return -EPIPE ; }if (pos >= runtime->buffer_size) { -if (snd_printd_ratelimit ()) { +if (printk_ratelimit ()) {char name[16 ];snd_pcm_debug_name (substream, name,sizeof (name));xrun_log_show (substream); -snd_printd (KERN_ERR "BUG: %s, pos = %ld, " -"buffer size = %ld, period size = %ld\n" , - name, pos, runtime->buffer_size, - runtime->period_size); +pcm_err (substream->pcm, +"BUG: %s, pos = %ld, buffer size = %ld, period size = %ld\n" , + name, pos, runtime->buffer_size, + runtime->period_size); } pos =0 ; }@@ -394,8 +392,8 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream, XRUN_DEBUG_PERIODUPDATE : XRUN_DEBUG_HWPTRUPDATE)) {char name[16 ];snd_pcm_debug_name (substream, name,sizeof (name)); - snd_printd("%s_update: %s: pos=%u/%u/%u, " - "hwptr=%ld/%ld/%ld/%ld\n", + pcm_dbg(substream->pcm, + "%s_update: %s: pos=%u/%u/%u, hwptr=%ld/%ld/%ld/%ld\n", in_interrupt ? "period" : "hwptr", name, (unsigned int)pos,@@ -1941,8 +1939,9 @@ static int wait_for_avail(struct snd_pcm_substream *substream,continue ; }if (!tout) { -snd_printd ("%s write error (DMA or IRQ trouble?)\n" , - is_playback ?"playback" :"capture" ); +pcm_dbg (substream->pcm, +"%s write error (DMA or IRQ trouble?)\n" , + is_playback ?"playback" :"capture" ); err = -EIO ;break ; }sound/core/pcm_native.c +24
-23@@ -190,12 +190,12 @@ int snd_pcm_hw_refine(struct snd_pcm_substream *substream,if (!(params->rmask & (1 << k)))continue ;#ifdef RULES_DEBUG -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 ]); +pr_debug ("%s = " , snd_pcm_hw_param_names[k]); +pr_cont ("%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));#ifdef RULES_DEBUG -printk ("%04x%04x%04x%04x\n" , m->bits[3 ], m->bits[2 ], m->bits[1 ], m->bits[0 ]); +pr_cont ("%04x%04x%04x%04x\n" , m->bits[3 ], m->bits[2 ], m->bits[1 ], m->bits[0 ]);#endif if (changed) params->cmask |=1 << k;@@ -210,21 +210,21 @@ int snd_pcm_hw_refine(struct snd_pcm_substream *substream,if (!(params->rmask & (1 << k)))continue ;#ifdef RULES_DEBUG -printk (KERN_DEBUG "%s = " , snd_pcm_hw_param_names[k]); +pr_debug ("%s = " , snd_pcm_hw_param_names[k]);if (i->empty) -printk ("empty" ); +pr_cont ("empty" );else -printk ("%c%u %u%c" , +pr_cont ("%c%u %u%c" , i->openmin ?'(' :'[' , i->min, i->max, i->openmax ?')' :']' ); -printk (" -> " ); +pr_cont (" -> " );#endif changed =snd_interval_refine (i,constrs_interval (constrs, k));#ifdef RULES_DEBUG if (i->empty) -printk ("empty\n" ); +pr_cont ("empty\n" );else -printk ("%c%u %u%c\n" , +pr_cont ("%c%u %u%c\n" , i->openmin ?'(' :'[' , i->min, i->max, i->openmax ?')' :']' );#endif @@ -255,18 +255,18 @@ int snd_pcm_hw_refine(struct snd_pcm_substream *substream,if (!doit)continue ;#ifdef RULES_DEBUG -printk (KERN_DEBUG "Rule %d [%p]: " , k, r->func); +pr_debug ("Rule %d [%p]: " , k, r->func);if (r->var >=0 ) { -printk ("%s = " , snd_pcm_hw_param_names[r->var]); +pr_cont ("%s = " , snd_pcm_hw_param_names[r->var]);if (hw_is_mask (r->var)) { m =hw_param_mask (params, r->var); -printk ("%x" , *m->bits); +pr_cont ("%x" , *m->bits); }else { i =hw_param_interval (params, r->var);if (i->empty) -printk ("empty" ); +pr_cont ("empty" );else -printk ("%c%u %u%c" , +pr_cont ("%c%u %u%c" , i->openmin ?'(' :'[' , i->min, i->max, i->openmax ?')' :']' ); }@@ -275,19 +275,19 @@ int snd_pcm_hw_refine(struct snd_pcm_substream *substream, changed = r->func (params, r);#ifdef RULES_DEBUG if (r->var >=0 ) { -printk (" -> " ); +pr_cont (" -> " );if (hw_is_mask (r->var)) -printk ("%x" , *m->bits); +pr_cont ("%x" , *m->bits);else {if (i->empty) -printk ("empty" ); +pr_cont ("empty" );else -printk ("%c%u %u%c" , +pr_cont ("%c%u %u%c" , i->openmin ?'(' :'[' , i->min, i->max, i->openmax ?')' :']' ); } } -printk ("\n" ); +pr_cont ("\n" );#endif rstamps[k] = stamp;if (changed && r->var >=0 ) {@@ -1541,7 +1541,8 @@ static int snd_pcm_drain(struct snd_pcm_substream *substream,if (substream->runtime->status->state ==SNDRV_PCM_STATE_SUSPENDED ) result = -ESTRPIPE ;else { -snd_printd ("playback drain error (DMA or IRQ trouble?)\n" ); +dev_dbg (substream->pcm->card->dev, +"playback drain error (DMA or IRQ trouble?)\n" );snd_pcm_stop (substream,SNDRV_PCM_STATE_SETUP ); result = -EIO ; }@@ -2066,7 +2067,7 @@ int snd_pcm_open_substream(struct snd_pcm *pcm, int stream, err =snd_pcm_hw_constraints_init (substream);if (err <0 ) { -snd_printd ("snd_pcm_hw_constraints_init failed\n" ); +pcm_dbg (pcm,"snd_pcm_hw_constraints_init failed\n" ); goto error; }@@ -2077,7 +2078,7 @@ int snd_pcm_open_substream(struct snd_pcm *pcm, int stream, err =snd_pcm_hw_constraints_complete (substream);if (err <0 ) { -snd_printd ("snd_pcm_hw_constraints_complete failed\n" ); +pcm_dbg (pcm,"snd_pcm_hw_constraints_complete failed\n" ); goto error; }@@ -2609,7 +2610,7 @@ static int snd_pcm_common_ioctl1(struct file *file,return res; } } -snd_printd ("unknown ioctl = 0x%x\n" , cmd); +pcm_dbg (substream->pcm,"unknown ioctl = 0x%x\n" , cmd);return -ENOTTY ; }sound/core/pcm_timer.c +3
-1@@ -53,7 +53,9 @@ void snd_pcm_timer_resolution_change(struct snd_pcm_substream *substream) post *=2 ; }if (rate ==0 ) { -snd_printk (KERN_ERR "pcm timer resolution out of range (rate = %u, period_size = %lu)\n" , runtime->rate, runtime->period_size); +pcm_err (substream->pcm, +"pcm timer resolution out of range (rate = %u, period_size = %lu)\n" , + runtime->rate, runtime->period_size); runtime->timer_resolution =-1 ;return ; }Signature · 6 lines
1.8.5.2 _______________________________________________ Alsa-devel mailing list [email protected] http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
PATCH 4/10 ALSA: core: Use standard printk helpers
In reply to Takashi IwaiUse dev_err() & co as much as possible. If not available (no device assigned at the calling point), use pr_xxx() helpers instead.
--- sound/core/device.c | 19 ++++++++++++++----- sound/core/info.c | 11 ++++++++--- sound/core/init.c | 20 ++++++++++---------- sound/core/isadma.c | 2 +- sound/core/memalloc.c | 4 ++-- sound/core/sound.c | 4 ++-- sound/core/vmaster.c | 2 +- 7 files changed, 38 insertions(+), 24 deletions(-)
sound/core/device.c +14 -5
@@ -25,6 +25,13 @@#include <linux/errno.h> #include <sound/core.h> +#define error(card, fmt, args...) do { \ + if (card) \ + dev_err((card)->dev, fmt, ##args); \ + else \ + pr_err(KERN_ERR "ALSA: " fmt, ##args); \ + } while (0) +/** * snd_device_new - create an ALSA device component * @card: the card instance
@@ -51,7 +58,7 @@ int snd_device_new(struct snd_card *card, enum snd_device_type type,return -ENXIO ; dev =kzalloc (sizeof (*dev),GFP_KERNEL );if (dev ==NULL ) { -snd_printk (KERN_ERR "Cannot allocate device\n" ); +error (dev->card,"Cannot allocate device, type=%d\n" , type);return -ENOMEM ; }INIT_LIST_HEAD (&dev->list);
@@ -78,7 +85,8 @@ static int __snd_device_disconnect(struct snd_device *dev)if (dev->state ==SNDRV_DEV_REGISTERED ) {if (dev->ops->dev_disconnect && dev->ops->dev_disconnect (dev)) -snd_printk (KERN_ERR "device disconnect failure\n" ); +error (dev->card,"device disconnect failure, type=%d\n" , + dev->type); dev->state =SNDRV_DEV_DISCONNECTED ; }return 0 ;
@@ -92,7 +100,8 @@ static int __snd_device_free(struct snd_device *dev)__snd_device_disconnect (dev);if (dev->ops->dev_free) {if (dev->ops->dev_free (dev)) -snd_printk (KERN_ERR "device free failure\n" ); +error (dev->card,"device free failure, type=%d\n" , + dev->type); }kfree (dev);return 0 ;
@@ -130,8 +139,8 @@ int snd_device_free(struct snd_card *card, void *device_data) dev =look_for_dev (card, device_data);if (dev)return __snd_device_free (dev); -snd_printd ("device free %p (from %pF), not found\n" , device_data, -__builtin_return_address (0 )); +dev_dbg (card->dev,"device free %p (from %pF), not found\n" , + device_data,__builtin_return_address (0 ));return -ENXIO ; }EXPORT_SYMBOL (snd_device_free);
sound/core/info.c +8 -3
@@ -418,9 +418,14 @@ static int snd_info_entry_release(struct inode *inode, struct file *file)if (entry->c.text.write) { entry->c.text.write (entry, data->wbuffer);if (data->wbuffer->error) { -snd_printk (KERN_WARNING "data write error to %s (%i)\n" , - entry->name, - data->wbuffer->error); +if (entry->card) +dev_warn (entry->card->dev,"info: data write error to %s (%i)\n" , + entry->name, + data->wbuffer->error); +else +pr_warn ("ALSA: info: data write error to %s (%i)\n" , + entry->name, + data->wbuffer->error); } }kfree (data->wbuffer->buffer);
sound/core/init.c +10 -10
@@ -113,11 +113,11 @@ static inline int init_info_for_card(struct snd_card *card)struct snd_info_entry *entry;if ((err =snd_info_card_register (card)) <0 ) { -snd_printd ("unable to create card info\n" ); +dev_dbg (card->dev,"unable to create card info\n" );return err; }if ((entry =snd_info_create_card_entry (card,"id" , card->proc_root)) ==NULL ) { -snd_printd ("unable to create card entry\n" ); +dev_dbg (card->dev,"unable to create card entry\n" );return err; } entry->c.text.read = snd_card_id_read;
@@ -217,7 +217,7 @@ int snd_card_new(struct device *parent, int idx, const char *xid, err = -ENODEV ;if (err <0 ) {mutex_unlock (&snd_card_mutex); -snd_printk (KERN_ERR "cannot find the slot for index %d (range 0-%i), error: %d\n" , +dev_err (parent,"cannot find the slot for index %d (range 0-%i), error: %d\n" , idx, snd_ecards_limit -1 , err);kfree (card);return err;
@@ -254,12 +254,12 @@ int snd_card_new(struct device *parent, int idx, const char *xid,/* snd_cards_bitmask and snd_cards are set with snd_card_register */ err =snd_ctl_create (card);if (err <0 ) { -snd_printk (KERN_ERR "unable to register control minors\n" ); +dev_err (parent,"unable to register control minors\n" ); goto __error; } err =snd_info_card_create (card);if (err <0 ) { -snd_printk (KERN_ERR "unable to create card info\n" ); +dev_err (parent,"unable to create card info\n" ); goto __error_ctl; } *card_ret = card;
@@ -422,7 +422,7 @@ int snd_card_disconnect(struct snd_card *card)/* notify all devices that we are disconnected */ err =snd_device_disconnect_all (card);if (err <0 ) -snd_printk (KERN_ERR "not all devices for card %i can be disconnected\n" , card->number); +dev_err (card->dev,"not all devices for card %i can be disconnected\n" , card->number);snd_info_card_disconnect (card);if (card->registered) {
@@ -455,14 +455,14 @@ static int snd_card_do_free(struct snd_card *card)snd_mixer_oss_notify_callback (card,SND_MIXER_OSS_NOTIFY_FREE );#endif if (snd_device_free_all (card) <0 ) { -snd_printk (KERN_ERR "unable to free all devices\n" ); +dev_err (card->dev,"unable to free all devices\n" );/* Fatal, but this situation should never occur */ }if (card->private_free) card->private_free (card);snd_info_free_entry (card->proc_id);if (snd_info_card_free (card) <0 ) { -snd_printk (KERN_WARNING "unable to free card info\n" ); +dev_warn (card->dev,"unable to free card info\n" );/* Not fatal error */ }if (card->release_completion)
@@ -588,7 +588,7 @@ static void snd_card_set_id_no_lock(struct snd_card *card, const char *src, goto again; }/* last resort... */ -snd_printk (KERN_ERR "unable to set card id (%s)\n" , id); +dev_err (card->dev,"unable to set card id (%s)\n" , id);if (card->proc_root->name)strlcpy (card->id, card->proc_root->name,sizeof (card->id)); }
@@ -940,7 +940,7 @@ int snd_card_file_remove(struct snd_card *card, struct file *file) }spin_unlock (&card->files_lock);if (!found) { -snd_printk (KERN_ERR "ALSA card file remove problem (%p)\n" , file); +dev_err (card->dev,"card file remove problem (%p)\n" , file);return -ENOENT ; }kfree (found);
sound/core/isadma.c +1 -1
@@ -106,7 +106,7 @@ unsigned int snd_dma_pointer(unsigned long dma, unsigned int size) result = result1;#ifdef CONFIG_SND_DEBUG if (result > size) -snd_printk (KERN_ERR "pointer (0x%x) for DMA #%ld is greater than transfer size (0x%x)\n" , result, dma, size); +pr_err ("ALSA: pointer (0x%x) for DMA #%ld is greater than transfer size (0x%x)\n" , result, dma, size);#endif if (result >= size || result ==0 )return 0 ;
sound/core/memalloc.c +2 -2
@@ -207,7 +207,7 @@ int snd_dma_alloc_pages(int type, struct device *device, size_t size,break ;#endif default : -printk (KERN_ERR "snd-malloc: invalid device type %d\n" , type); +pr_err ("snd-malloc: invalid device type %d\n" , type); dmab->area =NULL ; dmab->addr =0 ;return -ENXIO ;
@@ -284,7 +284,7 @@ void snd_dma_free_pages(struct snd_dma_buffer *dmab)break ;#endif default : -printk (KERN_ERR "snd-malloc: invalid device type %d\n" , dmab->dev.type); +pr_err ("snd-malloc: invalid device type %d\n" , dmab->dev.type); } }
sound/core/sound.c +2 -2
@@ -458,7 +458,7 @@ static int __init alsa_sound_init(void) snd_major = major; snd_ecards_limit = cards_limit;if (register_chrdev (major,"alsa" , &snd_fops)) { -snd_printk (KERN_ERR "unable to register native major device number %d\n" , major); +pr_err ("ALSA core: unable to register native major device number %d\n" , major);return -EIO ; }if (snd_info_init () <0 ) {
@@ -467,7 +467,7 @@ static int __init alsa_sound_init(void) }snd_info_minor_register ();#ifndef MODULE -printk (KERN_INFO "Advanced Linux Sound Architecture Driver Initialized.\n" ); +pr_info ("Advanced Linux Sound Architecture Driver Initialized.\n" );#endif return 0 ; }
sound/core/vmaster.c +1 -1
@@ -101,7 +101,7 @@ static int slave_init(struct link_slave *slave)if (slave->info.count >2 || (slave->info.type !=SNDRV_CTL_ELEM_TYPE_INTEGER && slave->info.type !=SNDRV_CTL_ELEM_TYPE_BOOLEAN )) { -snd_printk (KERN_ERR "invalid slave element\n" ); +pr_err ("ALSA: vmaster: invalid slave element\n" );kfree (uinfo);return -EINVAL ; }
Signature · 1 line
1.8.5.2
Re: [PATCH 04/10] ALSA: core: Use standard printk helpers
At Wed, 12 Feb 2014 12:33:06 +0100,
Quoted 34 lines · Takashi Iwai
Use
dev_err()& co as much as possible. If not available (no device assigned at the calling point), usepr_xxx()helpers instead.Signed-off-by Takashi Iwai <[email protected]>--- sound/core/device.c | 19 ++++++++++++++----- sound/core/info.c | 11 ++++++++--- sound/core/init.c | 20 ++++++++++---------- sound/core/isadma.c | 2 +- sound/core/memalloc.c | 4 ++-- sound/core/sound.c | 4 ++-- sound/core/vmaster.c | 2 +- 7 files changed, 38 insertions(+), 24 deletions(-)sound/core/device.c +7
-0@@ -25,6 +25,13 @@#include <linux/errno.h> #include <sound/core.h> +#define error(card, fmt, args...) do { \ + if (card) \ + dev_err((card)->dev, fmt, ##args); \ + else \ + pr_err(KERN_ERR "ALSA: " fmt, ##args); \ + } while (0) +/** * snd_device_new - create an ALSA device component * @card: the card instance
sound/core/device.c int snd_device_new(struct snd_card *card, enum snd_device_type type, · line 61
Quoted 5 lines
sound/core/device.c +1
-1@@ -51,7 +58,7 @@ int snd_device_new(struct snd_card *card, enum snd_device_type type,return -ENXIO ; dev =kzalloc (sizeof (*dev),GFP_KERNEL );if (dev ==NULL ) { -snd_printk (KERN_ERR "Cannot allocate device\n" ); +error (dev->card,"Cannot allocate device, type=%d\n" , type);
This leads to Oops. The fixed patch is below.
Takashi
-- 8< --
From: Takashi Iwai <[email protected]>
Subject: [PATCH v2] ALSA: core: Use standard printk helpers
Use dev_err() & co as much as possible. If not available (no device assigned at the calling point), use pr_xxx() helpers instead.
--- sound/core/device.c | 19 ++++++++++++++----- sound/core/info.c | 11 ++++++++--- sound/core/init.c | 20 ++++++++++---------- sound/core/isadma.c | 2 +- sound/core/memalloc.c | 4 ++-- sound/core/sound.c | 4 ++-- sound/core/vmaster.c | 2 +- 7 files changed, 38 insertions(+), 24 deletions(-)
sound/core/device.c +14 -5
@@ -25,6 +25,13 @@#include <linux/errno.h> #include <sound/core.h> +#define error(card, fmt, args...) do { \ + if (card) \ + dev_err((card)->dev, fmt, ##args); \ + else \ + pr_err(KERN_ERR "ALSA: " fmt, ##args); \ + } while (0) +/** * snd_device_new - create an ALSA device component * @card: the card instance
@@ -51,7 +58,7 @@ int snd_device_new(struct snd_card *card, enum snd_device_type type,return -ENXIO ; dev =kzalloc (sizeof (*dev),GFP_KERNEL );if (dev ==NULL ) { -snd_printk (KERN_ERR "Cannot allocate device\n" ); +error (card,"Cannot allocate device, type=%d\n" , type);return -ENOMEM ; }INIT_LIST_HEAD (&dev->list);
@@ -78,7 +85,8 @@ static int __snd_device_disconnect(struct snd_device *dev)if (dev->state ==SNDRV_DEV_REGISTERED ) {if (dev->ops->dev_disconnect && dev->ops->dev_disconnect (dev)) -snd_printk (KERN_ERR "device disconnect failure\n" ); +error (dev->card,"device disconnect failure, type=%d\n" , + dev->type); dev->state =SNDRV_DEV_DISCONNECTED ; }return 0 ;
@@ -92,7 +100,8 @@ static int __snd_device_free(struct snd_device *dev)__snd_device_disconnect (dev);if (dev->ops->dev_free) {if (dev->ops->dev_free (dev)) -snd_printk (KERN_ERR "device free failure\n" ); +error (dev->card,"device free failure, type=%d\n" , + dev->type); }kfree (dev);return 0 ;
@@ -130,8 +139,8 @@ int snd_device_free(struct snd_card *card, void *device_data) dev =look_for_dev (card, device_data);if (dev)return __snd_device_free (dev); -snd_printd ("device free %p (from %pF), not found\n" , device_data, -__builtin_return_address (0 )); +dev_dbg (card->dev,"device free %p (from %pF), not found\n" , + device_data,__builtin_return_address (0 ));return -ENXIO ; }EXPORT_SYMBOL (snd_device_free);
sound/core/info.c +8 -3
@@ -418,9 +418,14 @@ static int snd_info_entry_release(struct inode *inode, struct file *file)if (entry->c.text.write) { entry->c.text.write (entry, data->wbuffer);if (data->wbuffer->error) { -snd_printk (KERN_WARNING "data write error to %s (%i)\n" , - entry->name, - data->wbuffer->error); +if (entry->card) +dev_warn (entry->card->dev,"info: data write error to %s (%i)\n" , + entry->name, + data->wbuffer->error); +else +pr_warn ("ALSA: info: data write error to %s (%i)\n" , + entry->name, + data->wbuffer->error); } }kfree (data->wbuffer->buffer);
sound/core/init.c +10 -10
@@ -113,11 +113,11 @@ static inline int init_info_for_card(struct snd_card *card)struct snd_info_entry *entry;if ((err =snd_info_card_register (card)) <0 ) { -snd_printd ("unable to create card info\n" ); +dev_dbg (card->dev,"unable to create card info\n" );return err; }if ((entry =snd_info_create_card_entry (card,"id" , card->proc_root)) ==NULL ) { -snd_printd ("unable to create card entry\n" ); +dev_dbg (card->dev,"unable to create card entry\n" );return err; } entry->c.text.read = snd_card_id_read;
@@ -217,7 +217,7 @@ int snd_card_new(struct device *parent, int idx, const char *xid, err = -ENODEV ;if (err <0 ) {mutex_unlock (&snd_card_mutex); -snd_printk (KERN_ERR "cannot find the slot for index %d (range 0-%i), error: %d\n" , +dev_err (parent,"cannot find the slot for index %d (range 0-%i), error: %d\n" , idx, snd_ecards_limit -1 , err);kfree (card);return err;
@@ -254,12 +254,12 @@ int snd_card_new(struct device *parent, int idx, const char *xid,/* snd_cards_bitmask and snd_cards are set with snd_card_register */ err =snd_ctl_create (card);if (err <0 ) { -snd_printk (KERN_ERR "unable to register control minors\n" ); +dev_err (parent,"unable to register control minors\n" ); goto __error; } err =snd_info_card_create (card);if (err <0 ) { -snd_printk (KERN_ERR "unable to create card info\n" ); +dev_err (parent,"unable to create card info\n" ); goto __error_ctl; } *card_ret = card;
@@ -422,7 +422,7 @@ int snd_card_disconnect(struct snd_card *card)/* notify all devices that we are disconnected */ err =snd_device_disconnect_all (card);if (err <0 ) -snd_printk (KERN_ERR "not all devices for card %i can be disconnected\n" , card->number); +dev_err (card->dev,"not all devices for card %i can be disconnected\n" , card->number);snd_info_card_disconnect (card);if (card->registered) {
@@ -455,14 +455,14 @@ static int snd_card_do_free(struct snd_card *card)snd_mixer_oss_notify_callback (card,SND_MIXER_OSS_NOTIFY_FREE );#endif if (snd_device_free_all (card) <0 ) { -snd_printk (KERN_ERR "unable to free all devices\n" ); +dev_err (card->dev,"unable to free all devices\n" );/* Fatal, but this situation should never occur */ }if (card->private_free) card->private_free (card);snd_info_free_entry (card->proc_id);if (snd_info_card_free (card) <0 ) { -snd_printk (KERN_WARNING "unable to free card info\n" ); +dev_warn (card->dev,"unable to free card info\n" );/* Not fatal error */ }if (card->release_completion)
@@ -588,7 +588,7 @@ static void snd_card_set_id_no_lock(struct snd_card *card, const char *src, goto again; }/* last resort... */ -snd_printk (KERN_ERR "unable to set card id (%s)\n" , id); +dev_err (card->dev,"unable to set card id (%s)\n" , id);if (card->proc_root->name)strlcpy (card->id, card->proc_root->name,sizeof (card->id)); }
@@ -940,7 +940,7 @@ int snd_card_file_remove(struct snd_card *card, struct file *file) }spin_unlock (&card->files_lock);if (!found) { -snd_printk (KERN_ERR "ALSA card file remove problem (%p)\n" , file); +dev_err (card->dev,"card file remove problem (%p)\n" , file);return -ENOENT ; }kfree (found);
sound/core/isadma.c +1 -1
@@ -106,7 +106,7 @@ unsigned int snd_dma_pointer(unsigned long dma, unsigned int size) result = result1;#ifdef CONFIG_SND_DEBUG if (result > size) -snd_printk (KERN_ERR "pointer (0x%x) for DMA #%ld is greater than transfer size (0x%x)\n" , result, dma, size); +pr_err ("ALSA: pointer (0x%x) for DMA #%ld is greater than transfer size (0x%x)\n" , result, dma, size);#endif if (result >= size || result ==0 )return 0 ;
sound/core/memalloc.c +2 -2
@@ -207,7 +207,7 @@ int snd_dma_alloc_pages(int type, struct device *device, size_t size,break ;#endif default : -printk (KERN_ERR "snd-malloc: invalid device type %d\n" , type); +pr_err ("snd-malloc: invalid device type %d\n" , type); dmab->area =NULL ; dmab->addr =0 ;return -ENXIO ;
@@ -284,7 +284,7 @@ void snd_dma_free_pages(struct snd_dma_buffer *dmab)break ;#endif default : -printk (KERN_ERR "snd-malloc: invalid device type %d\n" , dmab->dev.type); +pr_err ("snd-malloc: invalid device type %d\n" , dmab->dev.type); } }
sound/core/sound.c +2 -2
@@ -458,7 +458,7 @@ static int __init alsa_sound_init(void) snd_major = major; snd_ecards_limit = cards_limit;if (register_chrdev (major,"alsa" , &snd_fops)) { -snd_printk (KERN_ERR "unable to register native major device number %d\n" , major); +pr_err ("ALSA core: unable to register native major device number %d\n" , major);return -EIO ; }if (snd_info_init () <0 ) {
@@ -467,7 +467,7 @@ static int __init alsa_sound_init(void) }snd_info_minor_register ();#ifndef MODULE -printk (KERN_INFO "Advanced Linux Sound Architecture Driver Initialized.\n" ); +pr_info ("Advanced Linux Sound Architecture Driver Initialized.\n" );#endif return 0 ; }
sound/core/vmaster.c +1 -1
@@ -101,7 +101,7 @@ static int slave_init(struct link_slave *slave)if (slave->info.count >2 || (slave->info.type !=SNDRV_CTL_ELEM_TYPE_INTEGER && slave->info.type !=SNDRV_CTL_ELEM_TYPE_BOOLEAN )) { -snd_printk (KERN_ERR "invalid slave element\n" ); +pr_err ("ALSA: vmaster: invalid slave element\n" );kfree (uinfo);return -EINVAL ; }
Signature · 1 line
1.8.5.2
PATCH 5/10 ALSA: rawmidi: Use standard printk helpers
In reply to Takashi IwaiUse dev_err() & co as much as possible. If not available (no device assigned at the calling point), use pr_xxx() helpers instead.
--- sound/core/rawmidi.c | 49 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 34 insertions(+), 15 deletions(-)
sound/core/rawmidi.c +34 -15
@@ -56,6 +56,13 @@ static int snd_rawmidi_dev_disconnect(struct snd_device *device);static LIST_HEAD (snd_rawmidi_devices);static DEFINE_MUTEX (register_mutex); +#define rmidi_err(rmidi, fmt, args...) \ + dev_err((rmidi)->card->dev, fmt, ##args) +#define rmidi_warn(rmidi, fmt, args...) \ + dev_warn((rmidi)->card->dev, fmt, ##args) +#define rmidi_dbg(rmidi, fmt, args...) \ + dev_dbg((rmidi)->card->dev, fmt, ##args) +static struct snd_rawmidi *snd_rawmidi_search (struct snd_card *card,int device) {struct snd_rawmidi *rawmidi;
@@ -180,7 +187,9 @@ int snd_rawmidi_drain_output(struct snd_rawmidi_substream *substream)if (signal_pending (current)) err = -ERESTARTSYS ;if (runtime->avail < runtime->buffer_size && !timeout) { -snd_printk (KERN_WARNING "rawmidi drain error (avail = %li, buffer_size = %li)\n" , (long )runtime->avail, (long )runtime->buffer_size); +rmidi_warn (substream->rmidi, +"rawmidi drain error (avail = %li, buffer_size = %li)\n" , + (long )runtime->avail, (long )runtime->buffer_size); err = -EIO ; } runtime->drain =0 ;
@@ -802,10 +811,9 @@ static long snd_rawmidi_ioctl(struct file *file, unsigned int cmd, unsigned longreturn -EINVAL ; } } -#ifdef CONFIG_SND_DEBUG default : -snd_printk (KERN_WARNING "rawmidi: unknown command = 0x%x\n" , cmd); -#endif +rmidi_dbg (rfile->rmidi, +"rawmidi: unknown command = 0x%x\n" , cmd); }return -ENOTTY ; }
@@ -875,7 +883,8 @@ int snd_rawmidi_receive(struct snd_rawmidi_substream *substream,if (!substream->opened)return -EBADFD ;if (runtime->buffer ==NULL ) { -snd_printd ("snd_rawmidi_receive: input is not active!!!\n" ); +rmidi_dbg (substream->rmidi, +"snd_rawmidi_receive: input is not active!!!\n" );return -EINVAL ; }spin_lock_irqsave (&runtime->lock, flags);
@@ -1034,7 +1043,8 @@ int snd_rawmidi_transmit_empty(struct snd_rawmidi_substream *substream)unsigned long flags;if (runtime->buffer ==NULL ) { -snd_printd ("snd_rawmidi_transmit_empty: output is not active!!!\n" ); +rmidi_dbg (substream->rmidi, +"snd_rawmidi_transmit_empty: output is not active!!!\n" );return 1 ; }spin_lock_irqsave (&runtime->lock, flags);
@@ -1065,7 +1075,8 @@ int snd_rawmidi_transmit_peek(struct snd_rawmidi_substream *substream,struct snd_rawmidi_runtime *runtime = substream->runtime;if (runtime->buffer ==NULL ) { -snd_printd ("snd_rawmidi_transmit_peek: output is not active!!!\n" ); +rmidi_dbg (substream->rmidi, +"snd_rawmidi_transmit_peek: output is not active!!!\n" );return -EINVAL ; } result =0 ;
@@ -1115,7 +1126,8 @@ int snd_rawmidi_transmit_ack(struct snd_rawmidi_substream *substream, int count)struct snd_rawmidi_runtime *runtime = substream->runtime;if (runtime->buffer ==NULL ) { -snd_printd ("snd_rawmidi_transmit_ack: output is not active!!!\n" ); +rmidi_dbg (substream->rmidi, +"snd_rawmidi_transmit_ack: output is not active!!!\n" );return -EINVAL ; }spin_lock_irqsave (&runtime->lock, flags);
@@ -1413,7 +1425,7 @@ static int snd_rawmidi_alloc_substreams(struct snd_rawmidi *rmidi,for (idx =0 ; idx < count; idx++) { substream =kzalloc (sizeof (*substream),GFP_KERNEL );if (substream ==NULL ) { -snd_printk (KERN_ERR "rawmidi: cannot allocate substream\n" ); +rmidi_err (rmidi,"rawmidi: cannot allocate substream\n" );return -ENOMEM ; } substream->stream = direction;
@@ -1458,7 +1470,7 @@ int snd_rawmidi_new(struct snd_card *card, char *id, int device, *rrawmidi =NULL ; rmidi =kzalloc (sizeof (*rmidi),GFP_KERNEL );if (rmidi ==NULL ) { -snd_printk (KERN_ERR "rawmidi: cannot allocate\n" ); +dev_err (card->dev,"rawmidi: cannot allocate\n" );return -ENOMEM ; } rmidi->card = card;
@@ -1557,7 +1569,8 @@ static int snd_rawmidi_dev_register(struct snd_device *device)if ((err =snd_register_device (SNDRV_DEVICE_TYPE_RAWMIDI , rmidi->card, rmidi->device, &snd_rawmidi_f_ops, rmidi, name)) <0 ) { -snd_printk (KERN_ERR "unable to register rawmidi device %i:%i\n" , rmidi->card->number, rmidi->device); +rmidi_err (rmidi,"unable to register rawmidi device %i:%i\n" , + rmidi->card->number, rmidi->device);list_del (&rmidi->list);mutex_unlock (®ister_mutex);return err;
@@ -1575,7 +1588,9 @@ static int snd_rawmidi_dev_register(struct snd_device *device)if (snd_register_oss_device (SNDRV_OSS_DEVICE_TYPE_MIDI , rmidi->card,0 , &snd_rawmidi_f_ops, rmidi) <0 ) { -snd_printk (KERN_ERR "unable to register OSS rawmidi device %i:%i\n" , rmidi->card->number,0 ); +rmidi_err (rmidi, +"unable to register OSS rawmidi device %i:%i\n" , + rmidi->card->number,0 ); }else { rmidi->ossreg++;#ifdef SNDRV_OSS_INFO_DEV_MIDI
@@ -1587,7 +1602,9 @@ static int snd_rawmidi_dev_register(struct snd_device *device)if (snd_register_oss_device (SNDRV_OSS_DEVICE_TYPE_MIDI , rmidi->card,1 , &snd_rawmidi_f_ops, rmidi) <0 ) { -snd_printk (KERN_ERR "unable to register OSS rawmidi device %i:%i\n" , rmidi->card->number,1 ); +rmidi_err (rmidi, +"unable to register OSS rawmidi device %i:%i\n" , + rmidi->card->number,1 ); }else { rmidi->ossreg++; }
@@ -1685,11 +1702,13 @@ static int __init alsa_rawmidi_init(void)/* check device map table */ for (i =0 ; i <SNDRV_CARDS ; i++) {if (midi_map[i] <0 || midi_map[i] >=SNDRV_RAWMIDI_DEVICES ) { -snd_printk (KERN_ERR "invalid midi_map[%d] = %d\n" , i, midi_map[i]); +pr_err ("ALSA: rawmidi: invalid midi_map[%d] = %d\n" , + i, midi_map[i]); midi_map[i] =0 ; }if (amidi_map[i] <0 || amidi_map[i] >=SNDRV_RAWMIDI_DEVICES ) { -snd_printk (KERN_ERR "invalid amidi_map[%d] = %d\n" , i, amidi_map[i]); +pr_err ("ALSA: rawmidi: invalid amidi_map[%d] = %d\n" , + i, amidi_map[i]); amidi_map[i] =1 ; } }
Signature · 1 line
1.8.5.2
PATCH 6/10 ALSA: hwdep: Use standard printk helpers
In reply to Takashi IwaiUse dev_err() & co as much as possible. If not available (no device assigned at the calling point), use pr_xxx() helpers instead.
--- sound/core/hwdep.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
sound/core/hwdep.c +12 -8
@@ -375,7 +375,7 @@ int snd_hwdep_new(struct snd_card *card, char *id, int device, *rhwdep =NULL ; hwdep =kzalloc (sizeof (*hwdep),GFP_KERNEL );if (hwdep ==NULL ) { -snd_printk (KERN_ERR "hwdep: cannot allocate\n" ); +dev_err (card->dev,"hwdep: cannot allocate\n" );return -ENOMEM ; } hwdep->card = card;
@@ -415,11 +415,12 @@ static int snd_hwdep_dev_free(struct snd_device *device)static int snd_hwdep_dev_register (struct snd_device *device) {struct snd_hwdep *hwdep = device->device_data; +struct snd_card *card = hwdep->card;int err;char name[32 ];mutex_lock (®ister_mutex); -if (snd_hwdep_search (hwdep->card, hwdep->device)) { +if (snd_hwdep_search (card, hwdep->device)) {mutex_unlock (®ister_mutex);return -EBUSY ; }
@@ -428,8 +429,9 @@ static int snd_hwdep_dev_register(struct snd_device *device)if ((err =snd_register_device (SNDRV_DEVICE_TYPE_HWDEP , hwdep->card, hwdep->device, &snd_hwdep_f_ops, hwdep, name)) <0 ) { -snd_printk (KERN_ERR "unable to register hardware dependent device %i:%i\n" , - hwdep->card->number, hwdep->device); +dev_err (card->dev, +"unable to register hardware dependent device %i:%i\n" , + card->number, hwdep->device);list_del (&hwdep->list);mutex_unlock (®ister_mutex);return err;
@@ -438,13 +440,15 @@ static int snd_hwdep_dev_register(struct snd_device *device) hwdep->ossreg =0 ;if (hwdep->oss_type >=0 ) {if ((hwdep->oss_type ==SNDRV_OSS_DEVICE_TYPE_DMFM ) && (hwdep->device !=0 )) { -snd_printk (KERN_WARNING "only hwdep device 0 can be registered as OSS direct FM device!\n" ); +dev_warn (card->dev, +"only hwdep device 0 can be registered as OSS direct FM device!\n" ); }else {if (snd_register_oss_device (hwdep->oss_type, - hwdep->card, hwdep->device, + card, hwdep->device, &snd_hwdep_f_ops, hwdep) <0 ) { -snd_printk (KERN_ERR "unable to register OSS compatibility device %i:%i\n" , - hwdep->card->number, hwdep->device); +dev_err (card->dev, +"unable to register OSS compatibility device %i:%i\n" , + card->number, hwdep->device); }else hwdep->ossreg =1 ; }
Signature · 1 line
1.8.5.2
PATCH 7/10 ALSA: oss: Use standard printk helpers
In reply to Takashi IwaiUse dev_err() & co as much as possible. If not available (no device assigned at the calling point), use pr_xxx() helpers instead.
--- sound/core/oss/mixer_oss.c | 12 +++--- sound/core/oss/pcm_oss.c | 99 ++++++++++++++++++++++------------------------ 2 files changed, 55 insertions(+), 56 deletions(-)
sound/core/oss/mixer_oss.c +7 -5
@@ -1187,7 +1187,8 @@ static void snd_mixer_oss_proc_write(struct snd_info_entry *entry,if (oss_mixer_names[ch] &&strcmp (oss_mixer_names[ch], str) ==0 )break ;if (ch >=SNDRV_OSS_MAX_MIXERS ) { -snd_printk (KERN_ERR "mixer_oss: invalid OSS volume '%s'\n" , str); +pr_err ("ALSA: mixer_oss: invalid OSS volume '%s'\n" , + str);continue ; } cptr =snd_info_get_str (str, cptr,sizeof (str));
@@ -1201,7 +1202,7 @@ static void snd_mixer_oss_proc_write(struct snd_info_entry *entry,snd_info_get_str (idxstr, cptr,sizeof (idxstr)); idx =simple_strtoul (idxstr,NULL ,10 );if (idx >=0x4000 ) {/* too big */ -snd_printk (KERN_ERR "mixer_oss: invalid index %d\n" , idx); +pr_err ("ALSA: mixer_oss: invalid index %d\n" , idx);continue ; }mutex_lock (&mixer->reg_mutex);
@@ -1212,7 +1213,7 @@ static void snd_mixer_oss_proc_write(struct snd_info_entry *entry, goto __unlock; tbl =kmalloc (sizeof (*tbl),GFP_KERNEL );if (! tbl) { -snd_printk (KERN_ERR "mixer_oss: no memory\n" ); +pr_err ("ALSA: mixer_oss: no memory\n" ); goto __unlock; } tbl->oss_id = ch;
@@ -1352,8 +1353,9 @@ static int snd_mixer_oss_notify_handler(struct snd_card *card, int cmd)if ((err =snd_register_oss_device (SNDRV_OSS_DEVICE_TYPE_MIXER , card,0 , &snd_mixer_oss_f_ops, card)) <0 ) { -snd_printk (KERN_ERR "unable to register OSS mixer device %i:%i\n" , - card->number,0 ); +dev_err (card->dev, +"unable to register OSS mixer device %i:%i\n" , + card->number,0 );kfree (mixer);return err; }
sound/core/oss/pcm_oss.c +48 -51
265 lines not on this page · raw message
Signature · 1 line
1.8.5.2
PATCH 8/10 ALSA: timer: Use standard printk helpers
In reply to Takashi IwaiUse the standard pr_xxx() helpers instead of home-baked snd_print*().
--- sound/core/hrtimer.c | 3 +-- sound/core/rtctimer.c | 3 +-- sound/core/timer.c | 13 ++++++------- 3 files changed, 8 insertions(+), 11 deletions(-)
sound/core/hrtimer.c +1 -2
@@ -126,8 +126,7 @@ static int __init snd_hrtimer_init(void)hrtimer_get_res (CLOCK_MONOTONIC , &tp);if (tp.tv_sec >0 || !tp.tv_nsec) { -snd_printk (KERN_ERR -"snd-hrtimer: Invalid resolution %u.%09u" , +pr_err ("snd-hrtimer: Invalid resolution %u.%09u" , (unsigned )tp.tv_sec, (unsigned )tp.tv_nsec);return -EINVAL ; }
sound/core/rtctimer.c +1 -2
@@ -132,8 +132,7 @@ static int __init rtctimer_init(void)if (rtctimer_freq <2 || rtctimer_freq >8192 || !is_power_of_2 (rtctimer_freq)) { -snd_printk (KERN_ERR "rtctimer: invalid frequency %d\n" , - rtctimer_freq); +pr_err ("ALSA: rtctimer: invalid frequency %d\n" , rtctimer_freq);return -EINVAL ; }
sound/core/timer.c +6 -7
@@ -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 (®ister_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 ; }
Signature · 1 line
1.8.5.2
PATCH 9/10 ALSA: seq: Use standard printk helpers
In reply to Takashi IwaiUse the standard pr_xxx() helpers instead of home-baked snd_print*().
--- sound/core/seq/seq_clientmgr.c | 16 ++++++++-------- sound/core/seq/seq_device.c | 16 ++++++++-------- sound/core/seq/seq_dummy.c | 2 +- sound/core/seq/seq_fifo.c | 2 +- sound/core/seq/seq_lock.c | 4 ++-- sound/core/seq/seq_memory.c | 8 ++++---- sound/core/seq/seq_midi.c | 8 ++++---- sound/core/seq/seq_midi_emul.c | 6 +++--- sound/core/seq/seq_ports.c | 4 ++-- sound/core/seq/seq_prioq.c | 14 +++++++------- sound/core/seq/seq_queue.c | 2 +- sound/core/seq/seq_timer.c | 10 +++++----- sound/core/seq/seq_virmidi.c | 2 +- 13 files changed, 47 insertions(+), 47 deletions(-)
sound/core/seq/seq_clientmgr.c +8 -8
@@ -123,7 +123,7 @@ static inline int snd_seq_write_pool_allocated(struct snd_seq_client *client)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 ; }
@@ -136,7 +136,7 @@ struct snd_seq_client *snd_seq_client_use_ptr(int clientid)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 ; }
@@ -291,8 +291,8 @@ static void seq_free_client(struct snd_seq_client * client)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 :
@@ -301,7 +301,7 @@ static void seq_free_client(struct snd_seq_client * 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);
@@ -773,7 +773,7 @@ static int broadcast_event(struct snd_seq_client *client,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 */
@@ -794,7 +794,7 @@ static int snd_seq_deliver_event(struct snd_seq_client *client, struct snd_seq_e 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 ;
@@ -2196,7 +2196,7 @@ static int snd_seq_do_ioctl(struct snd_seq_client *client, unsigned int cmd,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 ; }
sound/core/seq/seq_device.c +8 -8
@@ -325,7 +325,7 @@ int snd_seq_device_register_driver(char *id, struct snd_seq_dev_ops *entry,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 ;
@@ -398,7 +398,7 @@ int snd_seq_device_unregister_driver(char *id)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 ;
@@ -413,7 +413,7 @@ int snd_seq_device_unregister_driver(char *id) 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);
@@ -459,7 +459,7 @@ static int init_device(struct snd_seq_device *dev, struct ops_list *ops)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 ; }
@@ -467,7 +467,7 @@ static int init_device(struct snd_seq_device *dev, struct ops_list *ops) 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); }
@@ -486,7 +486,7 @@ static int free_device(struct snd_seq_device *dev, struct ops_list *ops)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 ; }
@@ -495,7 +495,7 @@ static int free_device(struct snd_seq_device *dev, struct ops_list *ops) 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); }
@@ -559,7 +559,7 @@ static void __exit alsa_seq_device_exit(void)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)
sound/core/seq/seq_dummy.c +1 -1
@@ -198,7 +198,7 @@ register_client(void)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 ; }
sound/core/seq/seq_fifo.c +1 -1
@@ -34,7 +34,7 @@ struct snd_seq_fifo *snd_seq_fifo_new(int poolsize) 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 ; }
sound/core/seq/seq_lock.c +2 -2
@@ -31,12 +31,12 @@ void snd_use_lock_sync_helper(snd_use_lock_t *lockp, const char *file, int line)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 );
sound/core/seq/seq_memory.c +4 -4
@@ -236,7 +236,7 @@ static int snd_seq_cell_alloc(struct snd_seq_pool *pool,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; }
@@ -388,7 +388,7 @@ int snd_seq_pool_init(struct snd_seq_pool *pool) 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 ; }
@@ -431,7 +431,7 @@ int snd_seq_pool_done(struct snd_seq_pool *pool)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 );
@@ -464,7 +464,7 @@ struct snd_seq_pool *snd_seq_pool_new(int poolsize)/* 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);
sound/core/seq/seq_midi.c +4 -4
@@ -121,7 +121,7 @@ static int dump_midi(struct snd_rawmidi_substream *substream, const char *buf, i 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)
@@ -145,7 +145,7 @@ static int event_process_midi(struct snd_seq_event *ev, int direct,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);
@@ -189,7 +189,7 @@ static int midisynth_subscribe(void *private_data, struct snd_seq_port_subscribe 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;
@@ -231,7 +231,7 @@ static int midisynth_use(void *private_data, struct snd_seq_port_subscribe *info 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));
sound/core/seq/seq_midi_emul.c +3 -3
@@ -89,7 +89,7 @@ snd_midi_process_event(struct snd_midi_op *ops,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 )
@@ -98,7 +98,7 @@ snd_midi_process_event(struct snd_midi_op *ops,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 ; }
@@ -232,7 +232,7 @@ snd_midi_process_event(struct snd_midi_op *ops,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 ; } }
sound/core/seq/seq_ports.c +2 -2
@@ -135,14 +135,14 @@ struct snd_seq_client_port *snd_seq_create_port(struct snd_seq_client *client,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 */
sound/core/seq/seq_prioq.c +7 -7
@@ -60,7 +60,7 @@ struct snd_seq_prioq *snd_seq_prioq_new(void) 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 ; }
@@ -79,7 +79,7 @@ void snd_seq_prioq_delete(struct snd_seq_prioq **fifo) *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 ; }
@@ -197,7 +197,7 @@ int snd_seq_prioq_cell_in(struct snd_seq_prioq * f, 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 ; } }
@@ -223,7 +223,7 @@ struct snd_seq_event_cell *snd_seq_prioq_cell_out(struct snd_seq_prioq *f)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);
@@ -248,7 +248,7 @@ struct snd_seq_event_cell *snd_seq_prioq_cell_out(struct snd_seq_prioq *f)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;
@@ -259,7 +259,7 @@ int snd_seq_prioq_avail(struct snd_seq_prioq * f)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;
@@ -321,7 +321,7 @@ void snd_seq_prioq_leave(struct snd_seq_prioq * f, int client, int timestamp) 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,
sound/core/seq/seq_queue.c +1 -1
@@ -112,7 +112,7 @@ static struct snd_seq_queue *queue_new(int owner, int locked) 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 ; }
sound/core/seq/seq_timer.c +5 -5
@@ -57,7 +57,7 @@ struct snd_seq_timer *snd_seq_timer_new(void) 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);
@@ -78,7 +78,7 @@ void snd_seq_timer_delete(struct snd_seq_timer **tmr) *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 ;
@@ -199,7 +199,7 @@ int snd_seq_timer_set_ppq(struct snd_seq_timer * tmr, int ppq)/* 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 ; }
@@ -252,7 +252,7 @@ int snd_seq_timer_set_skew(struct snd_seq_timer *tmr, unsigned int skew,/* 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);
@@ -292,7 +292,7 @@ int snd_seq_timer_open(struct snd_seq_queue *q) } }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;
sound/core/seq/seq_virmidi.c +1 -1
@@ -446,7 +446,7 @@ static int snd_virmidi_dev_register(struct snd_rawmidi *rmidi)/* 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 ;
Signature · 1 line
1.8.5.2
PATCH 10/10 ALSA: seq_oss: Use standard printk helpers
In reply to Takashi IwaiUse the standard pr_xxx() helpers instead of home-baked snd_print*().
--- sound/core/seq/oss/seq_oss.c | 8 ++++---- sound/core/seq/oss/seq_oss_init.c | 12 ++++++------ sound/core/seq/oss/seq_oss_midi.c | 4 ++-- sound/core/seq/oss/seq_oss_readq.c | 4 ++-- sound/core/seq/oss/seq_oss_synth.c | 8 ++++---- 5 files changed, 18 insertions(+), 18 deletions(-)
sound/core/seq/oss/seq_oss.c +4 -4
@@ -226,14 +226,14 @@ register_device(void)if ((rc =snd_register_oss_device (SNDRV_OSS_DEVICE_TYPE_SEQUENCER ,NULL ,0 , &seq_oss_f_ops,NULL )) <0 ) { -snd_printk (KERN_ERR "can't register device seq\n" ); +pr_err ("ALSA: seq_oss: can't register device seq\n" );mutex_unlock (®ister_mutex);return rc; }if ((rc =snd_register_oss_device (SNDRV_OSS_DEVICE_TYPE_MUSIC ,NULL ,0 , &seq_oss_f_ops,NULL )) <0 ) { -snd_printk (KERN_ERR "can't register device music\n" ); +pr_err ("ALSA: seq_oss: can't register device music\n" );snd_unregister_oss_device (SNDRV_OSS_DEVICE_TYPE_SEQUENCER ,NULL ,0 );mutex_unlock (®ister_mutex);return rc;
@@ -247,9 +247,9 @@ unregister_device(void) {mutex_lock (®ister_mutex);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 (®ister_mutex); }
sound/core/seq/oss/seq_oss_init.c +6 -6
@@ -189,7 +189,7 @@ snd_seq_oss_open(struct file *file, int level) dp =kzalloc (sizeof (*dp),GFP_KERNEL );if (!dp) { -snd_printk (KERN_ERR "can't malloc device info\n" ); +pr_err ("ALSA: seq_oss: can't malloc device info\n" );return -ENOMEM ; }
@@ -204,7 +204,7 @@ snd_seq_oss_open(struct file *file, int level) dp->index = i;if (i >=SNDRV_SEQ_OSS_MAX_CLIENTS ) { -snd_printk (KERN_ERR "too many applications\n" ); +pr_err ("ALSA: seq_oss: too many applications\n" ); rc = -ENOMEM ; goto _error; }
@@ -214,7 +214,7 @@ snd_seq_oss_open(struct file *file, int level)snd_seq_oss_midi_setup (dp);if (dp->synth_opened ==0 && dp->max_mididev ==0 ) { -/* snd_printk(KERN_ERR "no device found\n"); */ +/* pr_err("ALSA: seq_oss: no device found\n"); */ rc = -ENODEV ; goto _error; }
@@ -222,7 +222,7 @@ snd_seq_oss_open(struct file *file, int level)/* create port */ rc =create_port (dp);if (rc <0 ) { -snd_printk (KERN_ERR "can't create port\n" ); +pr_err ("ALSA: seq_oss: can't create port\n" ); goto _error; }
@@ -263,7 +263,7 @@ snd_seq_oss_open(struct file *file, int level)/* initialize timer */ dp->timer =snd_seq_oss_timer_new (dp);if (!dp->timer) { -snd_printk (KERN_ERR "can't alloc timer\n" ); +pr_err ("ALSA: seq_oss: can't alloc timer\n" ); rc = -ENOMEM ; goto _error; }
@@ -390,7 +390,7 @@ delete_seq_queue(int queue) qinfo.queue = queue; rc =call_ctl (SNDRV_SEQ_IOCTL_DELETE_QUEUE , &qinfo);if (rc <0 ) -printk (KERN_ERR "seq-oss: unable to delete queue %d (%d)\n" , queue, rc); +pr_err ("ALSA: seq_oss: unable to delete queue %d (%d)\n" , queue, rc);return rc; }
sound/core/seq/oss/seq_oss_midi.c +2 -2
@@ -174,7 +174,7 @@ snd_seq_oss_midi_check_new_port(struct snd_seq_port_info *pinfo)* allocate midi info record */ if ((mdev =kzalloc (sizeof (*mdev),GFP_KERNEL )) ==NULL ) { -snd_printk (KERN_ERR "can't malloc midi info\n" ); +pr_err ("ALSA: seq_oss: can't malloc midi info\n" );return -ENOMEM ; }
@@ -190,7 +190,7 @@ snd_seq_oss_midi_check_new_port(struct snd_seq_port_info *pinfo)/* create MIDI coder */ if (snd_midi_event_new (MAX_MIDI_EVENT_BUF , &mdev->coder) <0 ) { -snd_printk (KERN_ERR "can't malloc midi coder\n" ); +pr_err ("ALSA: seq_oss: can't malloc midi coder\n" );kfree (mdev);return -ENOMEM ; }
sound/core/seq/oss/seq_oss_readq.c +2 -2
@@ -48,12 +48,12 @@ snd_seq_oss_readq_new(struct seq_oss_devinfo *dp, int maxlen)struct seq_oss_readq *q;if ((q =kzalloc (sizeof (*q),GFP_KERNEL )) ==NULL ) { -snd_printk (KERN_ERR "can't malloc read queue\n" ); +pr_err ("ALSA: seq_oss: can't malloc read queue\n" );return NULL ; }if ((q->q =kcalloc (maxlen,sizeof (union evrec ),GFP_KERNEL )) ==NULL ) { -snd_printk (KERN_ERR "can't malloc read queue buffer\n" ); +pr_err ("ALSA: seq_oss: can't malloc read queue buffer\n" );kfree (q);return NULL ; }
sound/core/seq/oss/seq_oss_synth.c +4 -4
@@ -106,7 +106,7 @@ snd_seq_oss_synth_register(struct snd_seq_device *dev)unsigned long flags;if ((rec =kzalloc (sizeof (*rec),GFP_KERNEL )) ==NULL ) { -snd_printk (KERN_ERR "can't malloc synth info\n" ); +pr_err ("ALSA: seq_oss: can't malloc synth info\n" );return -ENOMEM ; } rec->seq_device =-1 ;
@@ -130,7 +130,7 @@ snd_seq_oss_synth_register(struct snd_seq_device *dev)if (i >= max_synth_devs) {if (max_synth_devs >=SNDRV_SEQ_OSS_MAX_SYNTH_DEVS ) {spin_unlock_irqrestore (®ister_lock, flags); -snd_printk (KERN_ERR "no more synth slot\n" ); +pr_err ("ALSA: seq_oss: no more synth slot\n" );kfree (rec);return -ENOMEM ; }
@@ -162,7 +162,7 @@ snd_seq_oss_synth_unregister(struct snd_seq_device *dev) }if (index >= max_synth_devs) {spin_unlock_irqrestore (®ister_lock, flags); -snd_printk (KERN_ERR "can't unregister synth\n" ); +pr_err ("ALSA: seq_oss: can't unregister synth\n" );return -EINVAL ; } synth_devs[index] =NULL ;
@@ -247,7 +247,7 @@ snd_seq_oss_synth_setup(struct seq_oss_devinfo *dp)if (info->nr_voices >0 ) { info->ch =kcalloc (info->nr_voices,sizeof (struct seq_oss_chinfo ),GFP_KERNEL );if (!info->ch) { -snd_printk (KERN_ERR "Cannot malloc\n" ); +pr_err ("ALSA: seq_oss: Cannot malloc voices\n" ); rec->oper.close (&info->arg);module_put (rec->oper.owner);snd_use_lock_free (&rec->use_lock);
Signature · 1 line
1.8.5.2
At Wed, 12 Feb 2014 12:33:02 +0100,
Quoted 5 lines · Takashi Iwai
OK, this is the last batch. This series converts the use of
snd_printk()and co with the standard ones likedev_err()in ALSA core codes. This became possible now by the new card device management.
Merged this series to for-next branch, too.
Let me know if anything got wrong with these merges.
thanks,
Takashi