diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2005-12-12 03:33:37 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-03 06:30:49 -0500 |
commit | 7b6d92451ad5e1136dc347347e888b94638b8ba9 (patch) | |
tree | e62edf62f29e988378cd2c984cde0ccb0993120b /sound/drivers/opl3/opl3_seq.c | |
parent | 83e8ad6984dccd6d848ac91ba0df379ff968180b (diff) |
[ALSA] seq: set client name in snd_seq_create_kernel_client()
All users of snd_seq_create_kernel_client() have to set the client name
anyway, so we can just pass the name as parameter. This relieves us
from having to muck around with a struct snd_seq_client_info in these
cases.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Diffstat (limited to 'sound/drivers/opl3/opl3_seq.c')
-rw-r--r-- | sound/drivers/opl3/opl3_seq.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/sound/drivers/opl3/opl3_seq.c b/sound/drivers/opl3/opl3_seq.c index 582ff63e784b..c4ead790008a 100644 --- a/sound/drivers/opl3/opl3_seq.c +++ b/sound/drivers/opl3/opl3_seq.c | |||
@@ -219,7 +219,7 @@ 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_info cinfo; | 222 | char name[32]; |
223 | int opl_ver; | 223 | int opl_ver; |
224 | 224 | ||
225 | opl3 = *(struct snd_opl3 **)SNDRV_SEQ_DEVICE_ARGPTR(dev); | 225 | opl3 = *(struct snd_opl3 **)SNDRV_SEQ_DEVICE_ARGPTR(dev); |
@@ -231,19 +231,14 @@ static int snd_opl3_seq_new_device(struct snd_seq_device *dev) | |||
231 | opl3->seq_client = -1; | 231 | opl3->seq_client = -1; |
232 | 232 | ||
233 | /* allocate new client */ | 233 | /* allocate new client */ |
234 | opl_ver = (opl3->hardware & OPL3_HW_MASK) >> 8; | ||
235 | sprintf(name, "OPL%i FM synth", opl_ver); | ||
234 | client = opl3->seq_client = | 236 | client = opl3->seq_client = |
235 | snd_seq_create_kernel_client(opl3->card, opl3->seq_dev_num); | 237 | snd_seq_create_kernel_client(opl3->card, opl3->seq_dev_num, |
238 | name); | ||
236 | if (client < 0) | 239 | if (client < 0) |
237 | return client; | 240 | return client; |
238 | 241 | ||
239 | /* change name of client */ | ||
240 | memset(&cinfo, 0, sizeof(cinfo)); | ||
241 | cinfo.client = client; | ||
242 | cinfo.type = KERNEL_CLIENT; | ||
243 | opl_ver = (opl3->hardware & OPL3_HW_MASK) >> 8; | ||
244 | sprintf(cinfo.name, "OPL%i FM synth", opl_ver); | ||
245 | snd_seq_kernel_client_ctl(client, SNDRV_SEQ_IOCTL_SET_CLIENT_INFO, &cinfo); | ||
246 | |||
247 | snd_opl3_synth_create_port(opl3); | 242 | snd_opl3_synth_create_port(opl3); |
248 | 243 | ||
249 | /* initialize instrument list */ | 244 | /* initialize instrument list */ |
@@ -264,7 +259,7 @@ static int snd_opl3_seq_new_device(struct snd_seq_device *dev) | |||
264 | opl3->sys_timer_status = 0; | 259 | opl3->sys_timer_status = 0; |
265 | 260 | ||
266 | #ifdef CONFIG_SND_SEQUENCER_OSS | 261 | #ifdef CONFIG_SND_SEQUENCER_OSS |
267 | snd_opl3_init_seq_oss(opl3, cinfo.name); | 262 | snd_opl3_init_seq_oss(opl3, name); |
268 | #endif | 263 | #endif |
269 | return 0; | 264 | return 0; |
270 | } | 265 | } |