diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2005-11-20 08:03:48 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-03 06:29:14 -0500 |
commit | 2af677fc884fc6dc79e65c99050ea607ac8bab9b (patch) | |
tree | 4291d36c2f116d5887b88da5f0213b68933a1201 /include/sound/pcm.h | |
parent | a106cd3d9e88c8761bd0eac2ce402cc82bd11fea (diff) |
[ALSA] dynamic minors (1/6): store device type in struct snd_minor
Instead of a comment string, store the device type in the snd_minor
structure. This makes snd_minor more flexible, and has the nice side
effect that we don't need anymore to create a separate snd_minor
template for registering a device but can pass the file_operations
directly to snd_register_device().
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Diffstat (limited to 'include/sound/pcm.h')
-rw-r--r-- | include/sound/pcm.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/sound/pcm.h b/include/sound/pcm.h index 7e77c0add80a..5e29b0e0f214 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h | |||
@@ -402,7 +402,6 @@ struct snd_pcm_str { | |||
402 | struct snd_pcm_oss_stream oss; | 402 | struct snd_pcm_oss_stream oss; |
403 | #endif | 403 | #endif |
404 | struct snd_pcm_file *files; | 404 | struct snd_pcm_file *files; |
405 | struct snd_minor *reg; | ||
406 | struct snd_info_entry *proc_root; | 405 | struct snd_info_entry *proc_root; |
407 | struct snd_info_entry *proc_info_entry; | 406 | struct snd_info_entry *proc_info_entry; |
408 | #ifdef CONFIG_SND_DEBUG | 407 | #ifdef CONFIG_SND_DEBUG |
@@ -441,7 +440,7 @@ struct snd_pcm_notify { | |||
441 | */ | 440 | */ |
442 | 441 | ||
443 | extern struct snd_pcm *snd_pcm_devices[]; | 442 | extern struct snd_pcm *snd_pcm_devices[]; |
444 | extern struct snd_minor snd_pcm_reg[2]; | 443 | extern struct file_operations snd_pcm_f_ops[2]; |
445 | 444 | ||
446 | int snd_pcm_new(struct snd_card *card, char *id, int device, | 445 | int snd_pcm_new(struct snd_card *card, char *id, int device, |
447 | int playback_count, int capture_count, | 446 | int playback_count, int capture_count, |