diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2005-12-12 03:30:43 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-03 06:30:47 -0500 |
commit | 83e8ad6984dccd6d848ac91ba0df379ff968180b (patch) | |
tree | 5ae1f379de542b8ede18ab1cc65537b01b21d212 /sound/drivers | |
parent | 255bd169ab645970f77d3fd7ac800781f96ddccb (diff) |
[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 <clemens@ladisch.de>
Diffstat (limited to 'sound/drivers')
-rw-r--r-- | sound/drivers/opl3/opl3_seq.c | 6 | ||||
-rw-r--r-- | sound/drivers/opl4/opl4_seq.c | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/sound/drivers/opl3/opl3_seq.c b/sound/drivers/opl3/opl3_seq.c index 1886b2958e77..582ff63e784b 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) | |||
219 | { | 219 | { |
220 | struct snd_opl3 *opl3; | 220 | struct snd_opl3 *opl3; |
221 | int client; | 221 | int client; |
222 | struct snd_seq_client_callback callbacks; | ||
223 | struct snd_seq_client_info cinfo; | 222 | struct snd_seq_client_info cinfo; |
224 | int opl_ver; | 223 | int opl_ver; |
225 | 224 | ||
@@ -232,11 +231,8 @@ static int snd_opl3_seq_new_device(struct snd_seq_device *dev) | |||
232 | opl3->seq_client = -1; | 231 | opl3->seq_client = -1; |
233 | 232 | ||
234 | /* allocate new client */ | 233 | /* allocate new client */ |
235 | memset(&callbacks, 0, sizeof(callbacks)); | ||
236 | callbacks.private_data = opl3; | ||
237 | callbacks.allow_output = callbacks.allow_input = 1; | ||
238 | client = opl3->seq_client = | 234 | client = opl3->seq_client = |
239 | snd_seq_create_kernel_client(opl3->card, opl3->seq_dev_num, &callbacks); | 235 | snd_seq_create_kernel_client(opl3->card, opl3->seq_dev_num); |
240 | if (client < 0) | 236 | if (client < 0) |
241 | return client; | 237 | return client; |
242 | 238 | ||
diff --git a/sound/drivers/opl4/opl4_seq.c b/sound/drivers/opl4/opl4_seq.c index bfd68e49c914..a69117dd0071 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) | |||
127 | { | 127 | { |
128 | struct snd_opl4 *opl4; | 128 | struct snd_opl4 *opl4; |
129 | int client; | 129 | int client; |
130 | struct snd_seq_client_callback callbacks; | ||
131 | struct snd_seq_client_info cinfo; | 130 | struct snd_seq_client_info cinfo; |
132 | struct snd_seq_port_callback pcallbacks; | 131 | struct snd_seq_port_callback pcallbacks; |
133 | 132 | ||
@@ -144,10 +143,7 @@ static int snd_opl4_seq_new_device(struct snd_seq_device *dev) | |||
144 | opl4->chset->private_data = opl4; | 143 | opl4->chset->private_data = opl4; |
145 | 144 | ||
146 | /* allocate new client */ | 145 | /* allocate new client */ |
147 | memset(&callbacks, 0, sizeof(callbacks)); | 146 | client = snd_seq_create_kernel_client(opl4->card, opl4->seq_dev_num); |
148 | callbacks.private_data = opl4; | ||
149 | callbacks.allow_output = callbacks.allow_input = 1; | ||
150 | client = snd_seq_create_kernel_client(opl4->card, opl4->seq_dev_num, &callbacks); | ||
151 | if (client < 0) { | 147 | if (client < 0) { |
152 | snd_midi_channel_free_set(opl4->chset); | 148 | snd_midi_channel_free_set(opl4->chset); |
153 | return client; | 149 | return client; |