iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ALSA: seq_oss: Drop debug prints

Browse Source 
The debug prints in snd-seq-oss module are rather useless.
Let's clean up before further modifications.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2014-02-04 18:04:49 +01:00
parent f246406481
commit a67ca25b6c
7 changed files with 0 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sound/core/seq/oss/seq_oss.c
View File

@ -39,12 +39,6 @@ MODULE_LICENSE("GPL");
MODULE_ALIAS_SNDRV_MINOR(SNDRV_MINOR_OSS_SEQUENCER); MODULE_ALIAS_SNDRV_MINOR(SNDRV_MINOR_OSS_SEQUENCER);
MODULE_ALIAS_SNDRV_MINOR(SNDRV_MINOR_OSS_MUSIC); 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 * prototypes
@ -244,7 +238,6 @@ register_device(void)
mutex_unlock(&register_mutex); mutex_unlock(&register_mutex);
return rc; return rc;
} }
debug_printk(("device registered\n"));
mutex_unlock(&register_mutex); mutex_unlock(&register_mutex);
return 0; return 0;
} }
@ -253,7 +246,6 @@ static void
unregister_device(void) unregister_device(void)
{ {
mutex_lock(&register_mutex); mutex_lock(&register_mutex);
debug_printk(("device unregistered\n"));
if (snd_unregister_oss_device(SNDRV_OSS_DEVICE_TYPE_MUSIC, NULL, 0) < 0) if (snd_unregister_oss_device(SNDRV_OSS_DEVICE_TYPE_MUSIC, NULL, 0) < 0)
snd_printk(KERN_ERR "error unregister device music\n"); snd_printk(KERN_ERR "error unregister device music\n");
if (snd_unregister_oss_device(SNDRV_OSS_DEVICE_TYPE_SEQUENCER, NULL, 0) < 0) if (snd_unregister_oss_device(SNDRV_OSS_DEVICE_TYPE_SEQUENCER, NULL, 0) < 0)

12
sound/core/seq/oss/seq_oss_device.h
View File

@ -31,9 +31,6 @@
#include <sound/seq_kernel.h> #include <sound/seq_kernel.h>
#include <sound/info.h> #include <sound/info.h>
/* enable debug print */
#define SNDRV_SEQ_OSS_DEBUG
/* max. applications */ /* max. applications */
#define SNDRV_SEQ_OSS_MAX_CLIENTS 16 #define SNDRV_SEQ_OSS_MAX_CLIENTS 16
#define SNDRV_SEQ_OSS_MAX_SYNTH_DEVS 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 */ /* misc. functions for proc interface */
char *enabled_str(int bool); 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 */ #endif /* __SEQ_OSS_DEVICE_H */

17
sound/core/seq/oss/seq_oss_init.c
View File

@ -92,7 +92,6 @@ snd_seq_oss_create_client(void)
goto __error; goto __error;
system_client = rc; system_client = rc;
debug_printk(("new client = %d\n", rc));
/* create annoucement receiver port */ /* create annoucement receiver port */
memset(port, 0, sizeof(*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"); snd_printk(KERN_ERR "can't malloc device info\n");
return -ENOMEM; return -ENOMEM;
} }
debug_printk(("oss_open: dp = %p\n", dp));
dp->cseq = system_client; dp->cseq = system_client;
dp->port = -1; dp->port = -1;
@ -222,7 +220,6 @@ snd_seq_oss_open(struct file *file, int level)
} }
/* create port */ /* create port */
debug_printk(("create new port\n"));
rc = create_port(dp); rc = create_port(dp);
if (rc < 0) { if (rc < 0) {
snd_printk(KERN_ERR "can't create port\n"); snd_printk(KERN_ERR "can't create port\n");
@ -230,7 +227,6 @@ snd_seq_oss_open(struct file *file, int level)
} }
/* allocate queue */ /* allocate queue */
debug_printk(("allocate queue\n"));
rc = alloc_seq_queue(dp); rc = alloc_seq_queue(dp);
if (rc < 0) if (rc < 0)
goto _error; goto _error;
@ -247,7 +243,6 @@ snd_seq_oss_open(struct file *file, int level)
dp->file_mode = translate_mode(file); dp->file_mode = translate_mode(file);
/* initialize read queue */ /* initialize read queue */
debug_printk(("initialize read queue\n"));
if (is_read_mode(dp->file_mode)) { if (is_read_mode(dp->file_mode)) {
dp->readq = snd_seq_oss_readq_new(dp, maxqlen); dp->readq = snd_seq_oss_readq_new(dp, maxqlen);
if (!dp->readq) { if (!dp->readq) {
@ -257,7 +252,6 @@ snd_seq_oss_open(struct file *file, int level)
} }
/* initialize write queue */ /* initialize write queue */
debug_printk(("initialize write queue\n"));
if (is_write_mode(dp->file_mode)) { if (is_write_mode(dp->file_mode)) {
dp->writeq = snd_seq_oss_writeq_new(dp, maxqlen); dp->writeq = snd_seq_oss_writeq_new(dp, maxqlen);
if (!dp->writeq) { if (!dp->writeq) {
@ -267,14 +261,12 @@ snd_seq_oss_open(struct file *file, int level)
} }
/* initialize timer */ /* initialize timer */
debug_printk(("initialize timer\n"));
dp->timer = snd_seq_oss_timer_new(dp); dp->timer = snd_seq_oss_timer_new(dp);
if (!dp->timer) { if (!dp->timer) {
snd_printk(KERN_ERR "can't alloc timer\n"); snd_printk(KERN_ERR "can't alloc timer\n");
rc = -ENOMEM; rc = -ENOMEM;
goto _error; goto _error;
} }
debug_printk(("timer initialized\n"));
/* set private data pointer */ /* set private data pointer */
file->private_data = dp; file->private_data = dp;
@ -288,7 +280,6 @@ snd_seq_oss_open(struct file *file, int level)
client_table[dp->index] = dp; client_table[dp->index] = dp;
num_clients++; num_clients++;
debug_printk(("open done\n"));
return 0; return 0;
_error: _error:
@ -347,7 +338,6 @@ create_port(struct seq_oss_devinfo *dp)
return rc; return rc;
dp->port = port.addr.port; dp->port = port.addr.port;
debug_printk(("new port = %d\n", port.addr.port));
return 0; return 0;
} }
@ -363,7 +353,6 @@ delete_port(struct seq_oss_devinfo *dp)
return 0; return 0;
} }
debug_printk(("delete_port %i\n", dp->port));
return snd_seq_event_port_detach(dp->cseq, 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; client_table[dp->index] = NULL;
num_clients--; num_clients--;
debug_printk(("resetting..\n"));
snd_seq_oss_reset(dp); snd_seq_oss_reset(dp);
debug_printk(("cleaning up..\n"));
snd_seq_oss_synth_cleanup(dp); snd_seq_oss_synth_cleanup(dp);
snd_seq_oss_midi_cleanup(dp); snd_seq_oss_midi_cleanup(dp);
/* clear slot */ /* clear slot */
debug_printk(("releasing resource..\n"));
queue = dp->queue; queue = dp->queue;
if (dp->port >= 0) if (dp->port >= 0)
delete_port(dp); delete_port(dp);
delete_seq_queue(queue); delete_seq_queue(queue);
debug_printk(("release done\n"));
} }
@ -466,7 +450,6 @@ snd_seq_oss_drain_write(struct seq_oss_devinfo *dp)
return; return;
if (is_write_mode(dp->file_mode) && !is_nonblock_mode(dp->file_mode) && if (is_write_mode(dp->file_mode) && !is_nonblock_mode(dp->file_mode) &&
dp->writeq) { dp->writeq) {
debug_printk(("syncing..\n"));
while (snd_seq_oss_writeq_sync(dp->writeq)) while (snd_seq_oss_writeq_sync(dp->writeq))
; ;
} }

18
sound/core/seq/oss/seq_oss_ioctl.c
View File

@ -90,12 +90,10 @@ snd_seq_oss_ioctl(struct seq_oss_devinfo *dp, unsigned int cmd, unsigned long ca
return snd_seq_oss_timer_ioctl(dp->timer, cmd, arg); return snd_seq_oss_timer_ioctl(dp->timer, cmd, arg);
case SNDCTL_SEQ_PANIC: case SNDCTL_SEQ_PANIC:
debug_printk(("panic\n"));
snd_seq_oss_reset(dp); snd_seq_oss_reset(dp);
return -EINVAL; return -EINVAL;
case SNDCTL_SEQ_SYNC: case SNDCTL_SEQ_SYNC:
debug_printk(("sync\n"));
if (! is_write_mode(dp->file_mode) || dp->writeq == NULL) if (! is_write_mode(dp->file_mode) || dp->writeq == NULL)
return 0; return 0;
while (snd_seq_oss_writeq_sync(dp->writeq)) 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 ca
return 0; return 0;
case SNDCTL_SEQ_RESET: case SNDCTL_SEQ_RESET:
debug_printk(("reset\n"));
snd_seq_oss_reset(dp); snd_seq_oss_reset(dp);
return 0; return 0;
case SNDCTL_SEQ_TESTMIDI: case SNDCTL_SEQ_TESTMIDI:
debug_printk(("test midi\n"));
if (get_user(dev, p)) if (get_user(dev, p))
return -EFAULT; return -EFAULT;
return snd_seq_oss_midi_open(dp, dev, dp->file_mode); return snd_seq_oss_midi_open(dp, dev, dp->file_mode);
case SNDCTL_SEQ_GETINCOUNT: case SNDCTL_SEQ_GETINCOUNT:
debug_printk(("get in count\n"));
if (dp->readq == NULL || ! is_read_mode(dp->file_mode)) if (dp->readq == NULL || ! is_read_mode(dp->file_mode))
return 0; return 0;
return put_user(dp->readq->qlen, p) ? -EFAULT : 0; return put_user(dp->readq->qlen, p) ? -EFAULT : 0;
case SNDCTL_SEQ_GETOUTCOUNT: case SNDCTL_SEQ_GETOUTCOUNT:
debug_printk(("get out count\n"));
if (! is_write_mode(dp->file_mode) || dp->writeq == NULL) if (! is_write_mode(dp->file_mode) || dp->writeq == NULL)
return 0; return 0;
return put_user(snd_seq_oss_writeq_get_free_size(dp->writeq), p) ? -EFAULT : 0; return put_user(snd_seq_oss_writeq_get_free_size(dp->writeq), p) ? -EFAULT : 0;
case SNDCTL_SEQ_GETTIME: case SNDCTL_SEQ_GETTIME:
debug_printk(("get time\n"));
return put_user(snd_seq_oss_timer_cur_tick(dp->timer), p) ? -EFAULT : 0; return put_user(snd_seq_oss_timer_cur_tick(dp->timer), p) ? -EFAULT : 0;
case SNDCTL_SEQ_RESETSAMPLES: case SNDCTL_SEQ_RESETSAMPLES:
debug_printk(("reset samples\n"));
if (get_user(dev, p)) if (get_user(dev, p))
return -EFAULT; return -EFAULT;
return snd_seq_oss_synth_ioctl(dp, dev, cmd, carg); return snd_seq_oss_synth_ioctl(dp, dev, cmd, carg);
case SNDCTL_SEQ_NRSYNTHS: case SNDCTL_SEQ_NRSYNTHS:
debug_printk(("nr synths\n"));
return put_user(dp->max_synthdev, p) ? -EFAULT : 0; return put_user(dp->max_synthdev, p) ? -EFAULT : 0;
case SNDCTL_SEQ_NRMIDIS: case SNDCTL_SEQ_NRMIDIS:
debug_printk(("nr midis\n"));
return put_user(dp->max_mididev, p) ? -EFAULT : 0; return put_user(dp->max_mididev, p) ? -EFAULT : 0;
case SNDCTL_SYNTH_MEMAVL: case SNDCTL_SYNTH_MEMAVL:
debug_printk(("mem avail\n"));
if (get_user(dev, p)) if (get_user(dev, p))
return -EFAULT; return -EFAULT;
val = snd_seq_oss_synth_ioctl(dp, dev, cmd, carg); val = snd_seq_oss_synth_ioctl(dp, dev, cmd, carg);
return put_user(val, p) ? -EFAULT : 0; return put_user(val, p) ? -EFAULT : 0;
case SNDCTL_FM_4OP_ENABLE: case SNDCTL_FM_4OP_ENABLE:
debug_printk(("4op\n"));
if (get_user(dev, p)) if (get_user(dev, p))
return -EFAULT; return -EFAULT;
snd_seq_oss_synth_ioctl(dp, dev, cmd, carg); 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 ca
case SNDCTL_SYNTH_INFO: case SNDCTL_SYNTH_INFO:
case SNDCTL_SYNTH_ID: case SNDCTL_SYNTH_ID:
debug_printk(("synth info\n"));
return snd_seq_oss_synth_info_user(dp, arg); return snd_seq_oss_synth_info_user(dp, arg);
case SNDCTL_SEQ_OUTOFBAND: case SNDCTL_SEQ_OUTOFBAND:
debug_printk(("out of band\n"));
return snd_seq_oss_oob_user(dp, arg); return snd_seq_oss_oob_user(dp, arg);
case SNDCTL_MIDI_INFO: case SNDCTL_MIDI_INFO:
debug_printk(("midi info\n"));
return snd_seq_oss_midi_info_user(dp, arg); return snd_seq_oss_midi_info_user(dp, arg);
case SNDCTL_SEQ_THRESHOLD: case SNDCTL_SEQ_THRESHOLD:
debug_printk(("threshold\n"));
if (! is_write_mode(dp->file_mode)) if (! is_write_mode(dp->file_mode))
return 0; return 0;
if (get_user(val, p)) if (get_user(val, p))
@ -186,7 +170,6 @@ snd_seq_oss_ioctl(struct seq_oss_devinfo *dp, unsigned int cmd, unsigned long ca
return 0; return 0;
case SNDCTL_MIDI_PRETIME: case SNDCTL_MIDI_PRETIME:
debug_printk(("pretime\n"));
if (dp->readq == NULL || !is_read_mode(dp->file_mode)) if (dp->readq == NULL || !is_read_mode(dp->file_mode))
return 0; return 0;
if (get_user(val, p)) if (get_user(val, p))
@ -199,7 +182,6 @@ snd_seq_oss_ioctl(struct seq_oss_devinfo *dp, unsigned int cmd, unsigned long ca
return put_user(val, p) ? -EFAULT : 0; return put_user(val, p) ? -EFAULT : 0;
default: default:
debug_printk(("others\n"));
if (! is_write_mode(dp->file_mode)) if (! is_write_mode(dp->file_mode))
return -EIO; return -EIO;
return snd_seq_oss_synth_ioctl(dp, 0, cmd, carg); return snd_seq_oss_synth_ioctl(dp, 0, cmd, carg);

3
sound/core/seq/oss/seq_oss_midi.c
View File

@ -153,7 +153,6 @@ snd_seq_oss_midi_check_new_port(struct snd_seq_port_info *pinfo)
struct seq_oss_midi *mdev; struct seq_oss_midi *mdev;
unsigned long flags; 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 */ /* the port must include generic midi */
if (! (pinfo->type & SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC)) if (! (pinfo->type & SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC))
return 0; return 0;
@ -406,7 +405,6 @@ snd_seq_oss_midi_close(struct seq_oss_devinfo *dp, int dev)
return 0; return 0;
} }
debug_printk(("closing client %d port %d mode %d\n", mdev->client, mdev->port, mdev->opened));
memset(&subs, 0, sizeof(subs)); memset(&subs, 0, sizeof(subs));
if (mdev->opened & PERM_WRITE) { if (mdev->opened & PERM_WRITE) {
subs.sender = dp->addr; 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; struct snd_seq_event ev;
int c; int c;
debug_printk(("resetting client %d port %d\n", mdev->client, mdev->port));
memset(&ev, 0, sizeof(ev)); memset(&ev, 0, sizeof(ev));
ev.dest.client = mdev->client; ev.dest.client = mdev->client;
ev.dest.port = mdev->port; ev.dest.port = mdev->port;

3
sound/core/seq/oss/seq_oss_synth.c
View File

@ -138,7 +138,6 @@ snd_seq_oss_synth_register(struct snd_seq_device *dev)
} }
rec->seq_device = i; rec->seq_device = i;
synth_devs[i] = rec; synth_devs[i] = rec;
debug_printk(("synth %s registered %d\n", rec->name, i));
spin_unlock_irqrestore(&register_lock, flags); spin_unlock_irqrestore(&register_lock, flags);
dev->driver_data = rec; dev->driver_data = rec;
#ifdef SNDRV_OSS_INFO_DEV_SYNTH #ifdef SNDRV_OSS_INFO_DEV_SYNTH
@ -256,7 +255,6 @@ snd_seq_oss_synth_setup(struct seq_oss_devinfo *dp)
} }
reset_channels(info); reset_channels(info);
} }
debug_printk(("synth %d assigned\n", i));
info->opened++; info->opened++;
rec->opened++; rec->opened++;
dp->synth_opened++; dp->synth_opened++;
@ -326,7 +324,6 @@ snd_seq_oss_synth_cleanup(struct seq_oss_devinfo *dp)
if (rec == NULL) if (rec == NULL)
continue; continue;
if (rec->opened > 0) { if (rec->opened > 0) {
debug_printk(("synth %d closed\n", i));
rec->oper.close(&info->arg); rec->oper.close(&info->arg);
module_put(rec->oper.owner); module_put(rec->oper.owner);
rec->opened = 0; rec->opened = 0;

7
sound/core/seq/oss/seq_oss_timer.c
View File

@ -233,7 +233,6 @@ snd_seq_oss_timer_ioctl(struct seq_oss_timer *timer, unsigned int cmd, int __use
int value; int value;
if (cmd == SNDCTL_SEQ_CTRLRATE) { if (cmd == SNDCTL_SEQ_CTRLRATE) {
debug_printk(("ctrl rate\n"));
/* if *arg == 0, just return the current rate */ /* if *arg == 0, just return the current rate */
if (get_user(value, arg)) if (get_user(value, arg))
return -EFAULT; return -EFAULT;
@ -248,21 +247,16 @@ snd_seq_oss_timer_ioctl(struct seq_oss_timer *timer, unsigned int cmd, int __use
switch (cmd) { switch (cmd) {
case SNDCTL_TMR_START: case SNDCTL_TMR_START:
debug_printk(("timer start\n"));
return snd_seq_oss_timer_start(timer); return snd_seq_oss_timer_start(timer);
case SNDCTL_TMR_STOP: case SNDCTL_TMR_STOP:
debug_printk(("timer stop\n"));
return snd_seq_oss_timer_stop(timer); return snd_seq_oss_timer_stop(timer);
case SNDCTL_TMR_CONTINUE: case SNDCTL_TMR_CONTINUE:
debug_printk(("timer continue\n"));
return snd_seq_oss_timer_continue(timer); return snd_seq_oss_timer_continue(timer);
case SNDCTL_TMR_TEMPO: case SNDCTL_TMR_TEMPO:
debug_printk(("timer tempo\n"));
if (get_user(value, arg)) if (get_user(value, arg))
return -EFAULT; return -EFAULT;
return snd_seq_oss_timer_tempo(timer, value); return snd_seq_oss_timer_tempo(timer, value);
case SNDCTL_TMR_TIMEBASE: case SNDCTL_TMR_TIMEBASE:
debug_printk(("timer timebase\n"));
if (get_user(value, arg)) if (get_user(value, arg))
return -EFAULT; return -EFAULT;
if (value < MIN_OSS_TIMEBASE) if (value < MIN_OSS_TIMEBASE)
@ -276,7 +270,6 @@ snd_seq_oss_timer_ioctl(struct seq_oss_timer *timer, unsigned int cmd, int __use
case SNDCTL_TMR_METRONOME: case SNDCTL_TMR_METRONOME:
case SNDCTL_TMR_SELECT: case SNDCTL_TMR_SELECT:
case SNDCTL_TMR_SOURCE: case SNDCTL_TMR_SOURCE:
debug_printk(("timer XXX\n"));
/* not supported */ /* not supported */
return 0; return 0;
} }