From 83e8ad6984dccd6d848ac91ba0df379ff968180b Mon Sep 17 00:00:00 2001 From: Clemens Ladisch Date: Mon, 12 Dec 2005 09:30:43 +0100 Subject: [PATCH] [ALSA] seq: remove struct snd_seq_client_callback The fields of struct snd_seq_client_callback either aren't used or are always set to the same value, so we can get rid of it altogether. Signed-off-by: Clemens Ladisch --- include/sound/seq_kernel.h | 12 +----------- sound/core/seq/oss/seq_oss_init.c | 9 +-------- sound/core/seq/seq_clientmgr.c | 9 +++------ sound/core/seq/seq_clientmgr.h | 2 -- sound/core/seq/seq_dummy.c | 6 +----- sound/core/seq/seq_midi.c | 6 +----- sound/core/seq/seq_system.c | 6 +----- sound/core/seq/seq_virmidi.c | 7 +------ sound/drivers/opl3/opl3_seq.c | 6 +----- sound/drivers/opl4/opl4_seq.c | 6 +----- sound/isa/gus/gus_synth.c | 6 +----- sound/pci/trident/trident_synth.c | 6 +----- sound/synth/emux/emux_seq.c | 8 +------- 13 files changed, 14 insertions(+), 75 deletions(-) diff --git a/include/sound/seq_kernel.h b/include/sound/seq_kernel.h index 1b60890b44..77cf57e214 100644 --- a/include/sound/seq_kernel.h +++ b/include/sound/seq_kernel.h @@ -60,15 +60,6 @@ typedef union snd_seq_timestamp snd_seq_timestamp_t; /* max size of event size */ #define SNDRV_SEQ_MAX_EVENT_LEN 0x3fffffff -/* call-backs for kernel client */ - -struct snd_seq_client_callback { - void *private_data; - unsigned allow_input: 1, - allow_output: 1; - /*...*/ -}; - /* call-backs for kernel port */ struct snd_seq_port_callback { struct module *owner; @@ -84,8 +75,7 @@ struct snd_seq_port_callback { }; /* interface for kernel client */ -int snd_seq_create_kernel_client(struct snd_card *card, int client_index, - struct snd_seq_client_callback *callback); +int snd_seq_create_kernel_client(struct snd_card *card, int client_index); int snd_seq_delete_kernel_client(int client); int snd_seq_kernel_client_enqueue(int client, struct snd_seq_event *ev, int atomic, int hop); int snd_seq_kernel_client_dispatch(int client, struct snd_seq_event *ev, int atomic, int hop); diff --git a/sound/core/seq/oss/seq_oss_init.c b/sound/core/seq/oss/seq_oss_init.c index 97e2493e93..cd4139adec 100644 --- a/sound/core/seq/oss/seq_oss_init.c +++ b/sound/core/seq/oss/seq_oss_init.c @@ -65,7 +65,6 @@ int __init snd_seq_oss_create_client(void) { int rc; - struct snd_seq_client_callback callback; struct snd_seq_client_info *info; struct snd_seq_port_info *port; struct snd_seq_port_callback port_callback; @@ -78,13 +77,7 @@ snd_seq_oss_create_client(void) } /* create ALSA client */ - memset(&callback, 0, sizeof(callback)); - - callback.private_data = NULL; - callback.allow_input = 1; - callback.allow_output = 1; - - rc = snd_seq_create_kernel_client(NULL, SNDRV_SEQ_CLIENT_OSS, &callback); + rc = snd_seq_create_kernel_client(NULL, SNDRV_SEQ_CLIENT_OSS); if (rc < 0) goto __error; diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c index 79199f53d6..bd8c098978 100644 --- a/sound/core/seq/seq_clientmgr.c +++ b/sound/core/seq/seq_clientmgr.c @@ -2212,15 +2212,12 @@ static long snd_seq_ioctl(struct file *file, unsigned int cmd, unsigned long arg /* exported to kernel modules */ -int snd_seq_create_kernel_client(struct snd_card *card, int client_index, - struct snd_seq_client_callback *callback) +int snd_seq_create_kernel_client(struct snd_card *card, int client_index) { struct snd_seq_client *client; snd_assert(! in_interrupt(), return -EBUSY); - if (callback == NULL) - return -EINVAL; if (card && client_index > 3) return -EINVAL; if (card == NULL && client_index > 63) @@ -2244,8 +2241,8 @@ int snd_seq_create_kernel_client(struct snd_card *card, int client_index, } usage_alloc(&client_usage, 1); - client->accept_input = callback->allow_output; - client->accept_output = callback->allow_input; + client->accept_input = 1; + client->accept_output = 1; sprintf(client->name, "Client-%d", client->number); diff --git a/sound/core/seq/seq_clientmgr.h b/sound/core/seq/seq_clientmgr.h index 7131d218dc..450091ca15 100644 --- a/sound/core/seq/seq_clientmgr.h +++ b/sound/core/seq/seq_clientmgr.h @@ -91,8 +91,6 @@ struct snd_seq_client *snd_seq_client_use_ptr(int clientid); int snd_seq_dispatch_event(struct snd_seq_event_cell *cell, int atomic, int hop); /* exported to other modules */ -int snd_seq_register_kernel_client(struct snd_seq_client_callback *callback, void *private_data); -int snd_seq_unregister_kernel_client(int client); int snd_seq_kernel_client_enqueue(int client, struct snd_seq_event *ev, int atomic, int hop); int snd_seq_kernel_client_enqueue_blocking(int client, struct snd_seq_event * ev, struct file *file, int atomic, int hop); diff --git a/sound/core/seq/seq_dummy.c b/sound/core/seq/seq_dummy.c index 8101a475e3..e7344b6332 100644 --- a/sound/core/seq/seq_dummy.c +++ b/sound/core/seq/seq_dummy.c @@ -193,7 +193,6 @@ create_port(int idx, int type) static int __init register_client(void) { - struct snd_seq_client_callback cb; struct snd_seq_client_info cinfo; struct snd_seq_dummy_port *rec1, *rec2; int i; @@ -204,10 +203,7 @@ register_client(void) } /* create client */ - memset(&cb, 0, sizeof(cb)); - cb.allow_input = 1; - cb.allow_output = 1; - my_client = snd_seq_create_kernel_client(NULL, SNDRV_SEQ_CLIENT_DUMMY, &cb); + my_client = snd_seq_create_kernel_client(NULL, SNDRV_SEQ_CLIENT_DUMMY); if (my_client < 0) return my_client; diff --git a/sound/core/seq/seq_midi.c b/sound/core/seq/seq_midi.c index 0a65eb2f97..512ffddd15 100644 --- a/sound/core/seq/seq_midi.c +++ b/sound/core/seq/seq_midi.c @@ -295,7 +295,6 @@ snd_seq_midisynth_register_port(struct snd_seq_device *dev) struct snd_rawmidi_info *info; int newclient = 0; unsigned int p, ports; - struct snd_seq_client_callback callbacks; struct snd_seq_port_callback pcallbacks; struct snd_card *card = dev->card; int device = dev->device; @@ -334,10 +333,7 @@ snd_seq_midisynth_register_port(struct snd_seq_device *dev) kfree(info); return -ENOMEM; } - memset(&callbacks, 0, sizeof(callbacks)); - callbacks.private_data = client; - callbacks.allow_input = callbacks.allow_output = 1; - client->seq_client = snd_seq_create_kernel_client(card, 0, &callbacks); + client->seq_client = snd_seq_create_kernel_client(card, 0); if (client->seq_client < 0) { kfree(client); up(®ister_mutex); diff --git a/sound/core/seq/seq_system.c b/sound/core/seq/seq_system.c index 86b1cba33c..c87c883bd9 100644 --- a/sound/core/seq/seq_system.c +++ b/sound/core/seq/seq_system.c @@ -120,8 +120,6 @@ static int event_input_timer(struct snd_seq_event * ev, int direct, void *privat /* register our internal client */ int __init snd_seq_system_client_init(void) { - - struct snd_seq_client_callback callbacks; struct snd_seq_port_callback pcallbacks; struct snd_seq_client_info *inf; struct snd_seq_port_info *port; @@ -134,14 +132,12 @@ int __init snd_seq_system_client_init(void) return -ENOMEM; } - memset(&callbacks, 0, sizeof(callbacks)); memset(&pcallbacks, 0, sizeof(pcallbacks)); pcallbacks.owner = THIS_MODULE; pcallbacks.event_input = event_input_timer; /* register client */ - callbacks.allow_input = callbacks.allow_output = 1; - sysclient = snd_seq_create_kernel_client(NULL, 0, &callbacks); + sysclient = snd_seq_create_kernel_client(NULL, 0); /* set our name */ inf->client = 0; diff --git a/sound/core/seq/seq_virmidi.c b/sound/core/seq/seq_virmidi.c index ea2113968f..2739f57725 100644 --- a/sound/core/seq/seq_virmidi.c +++ b/sound/core/seq/seq_virmidi.c @@ -359,7 +359,6 @@ static struct snd_rawmidi_ops snd_virmidi_output_ops = { static int snd_virmidi_dev_attach_seq(struct snd_virmidi_dev *rdev) { int client; - struct snd_seq_client_callback callbacks; struct snd_seq_port_callback pcallbacks; struct snd_seq_client_info *info; struct snd_seq_port_info *pinfo; @@ -375,11 +374,7 @@ static int snd_virmidi_dev_attach_seq(struct snd_virmidi_dev *rdev) goto __error; } - memset(&callbacks, 0, sizeof(callbacks)); - callbacks.private_data = rdev; - callbacks.allow_input = 1; - callbacks.allow_output = 1; - client = snd_seq_create_kernel_client(rdev->card, rdev->device, &callbacks); + client = snd_seq_create_kernel_client(rdev->card, rdev->device); if (client < 0) { err = client; goto __error; diff --git a/sound/drivers/opl3/opl3_seq.c b/sound/drivers/opl3/opl3_seq.c index 1886b2958e..582ff63e78 100644 --- a/sound/drivers/opl3/opl3_seq.c +++ b/sound/drivers/opl3/opl3_seq.c @@ -219,7 +219,6 @@ static int snd_opl3_seq_new_device(struct snd_seq_device *dev) { struct snd_opl3 *opl3; int client; - struct snd_seq_client_callback callbacks; struct snd_seq_client_info cinfo; int opl_ver; @@ -232,11 +231,8 @@ static int snd_opl3_seq_new_device(struct snd_seq_device *dev) opl3->seq_client = -1; /* allocate new client */ - memset(&callbacks, 0, sizeof(callbacks)); - callbacks.private_data = opl3; - callbacks.allow_output = callbacks.allow_input = 1; client = opl3->seq_client = - snd_seq_create_kernel_client(opl3->card, opl3->seq_dev_num, &callbacks); + snd_seq_create_kernel_client(opl3->card, opl3->seq_dev_num); if (client < 0) return client; diff --git a/sound/drivers/opl4/opl4_seq.c b/sound/drivers/opl4/opl4_seq.c index bfd68e49c9..a69117dd00 100644 --- a/sound/drivers/opl4/opl4_seq.c +++ b/sound/drivers/opl4/opl4_seq.c @@ -127,7 +127,6 @@ static int snd_opl4_seq_new_device(struct snd_seq_device *dev) { struct snd_opl4 *opl4; int client; - struct snd_seq_client_callback callbacks; struct snd_seq_client_info cinfo; struct snd_seq_port_callback pcallbacks; @@ -144,10 +143,7 @@ static int snd_opl4_seq_new_device(struct snd_seq_device *dev) opl4->chset->private_data = opl4; /* allocate new client */ - memset(&callbacks, 0, sizeof(callbacks)); - callbacks.private_data = opl4; - callbacks.allow_output = callbacks.allow_input = 1; - client = snd_seq_create_kernel_client(opl4->card, opl4->seq_dev_num, &callbacks); + client = snd_seq_create_kernel_client(opl4->card, opl4->seq_dev_num); if (client < 0) { snd_midi_channel_free_set(opl4->chset); return client; diff --git a/sound/isa/gus/gus_synth.c b/sound/isa/gus/gus_synth.c index 9c7d6986f6..6464488363 100644 --- a/sound/isa/gus/gus_synth.c +++ b/sound/isa/gus/gus_synth.c @@ -214,7 +214,6 @@ static int snd_gus_synth_new_device(struct snd_seq_device *dev) { struct snd_gus_card *gus; int client, i; - struct snd_seq_client_callback callbacks; struct snd_seq_client_info *cinfo; struct snd_seq_port_subscribe sub; struct snd_iwffff_ops *iwops; @@ -233,11 +232,8 @@ static int snd_gus_synth_new_device(struct snd_seq_device *dev) return -ENOMEM; /* allocate new client */ - memset(&callbacks, 0, sizeof(callbacks)); - callbacks.private_data = gus; - callbacks.allow_output = callbacks.allow_input = 1; client = gus->gf1.seq_client = - snd_seq_create_kernel_client(gus->card, 1, &callbacks); + snd_seq_create_kernel_client(gus->card, 1); if (client < 0) { kfree(cinfo); return client; diff --git a/sound/pci/trident/trident_synth.c b/sound/pci/trident/trident_synth.c index a49682ef3e..e31055a4bd 100644 --- a/sound/pci/trident/trident_synth.c +++ b/sound/pci/trident/trident_synth.c @@ -934,7 +934,6 @@ static int snd_trident_synth_new_device(struct snd_seq_device *dev) { struct snd_trident *trident; int client, i; - struct snd_seq_client_callback callbacks; struct snd_seq_client_info cinfo; struct snd_seq_port_subscribe sub; struct snd_simple_ops *simpleops; @@ -947,11 +946,8 @@ static int snd_trident_synth_new_device(struct snd_seq_device *dev) trident->synth.seq_client = -1; /* allocate new client */ - memset(&callbacks, 0, sizeof(callbacks)); - callbacks.private_data = trident; - callbacks.allow_output = callbacks.allow_input = 1; client = trident->synth.seq_client = - snd_seq_create_kernel_client(trident->card, 1, &callbacks); + snd_seq_create_kernel_client(trident->card, 1); if (client < 0) return client; diff --git a/sound/synth/emux/emux_seq.c b/sound/synth/emux/emux_seq.c index f5a832ff36..b7129c5aee 100644 --- a/sound/synth/emux/emux_seq.c +++ b/sound/synth/emux/emux_seq.c @@ -347,17 +347,11 @@ snd_emux_unuse(void *private_data, struct snd_seq_port_subscribe *info) static int get_client(struct snd_card *card, int index, char *name) { - struct snd_seq_client_callback callbacks; struct snd_seq_client_info cinfo; int client; - memset(&callbacks, 0, sizeof(callbacks)); - callbacks.private_data = NULL; - callbacks.allow_input = 1; - callbacks.allow_output = 1; - /* Find a free client, start from 1 as the MPU expects to use 0 */ - client = snd_seq_create_kernel_client(card, index, &callbacks); + client = snd_seq_create_kernel_client(card, index); if (client < 0) return client; -- 2.39.5