aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2005-11-20 08:05:49 -0500
committerJaroslav Kysela <perex@suse.cz>2006-01-03 06:29:15 -0500
commit6983b7240cd229787c3ee00e663ea94ea649d96a (patch)
tree25005b4a0fce5465e70961a5d3fe2d040786f890 /include
parent2af677fc884fc6dc79e65c99050ea607ac8bab9b (diff)
[ALSA] dynamic minors (2/6): simplify storage of snd_minor structures
Modules: ALSA Core Store the snd_minor structure pointers in one array instead of using a separate list for each card. This simplifies the mapping from device files to minor struct by removing the need to know about the encoding of the card number in the minor number. Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Diffstat (limited to 'include')
-rw-r--r--include/sound/core.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/include/sound/core.h b/include/sound/core.h
index f557c8ac450e..67b0a7e764e7 100644
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -183,9 +183,8 @@ static inline int snd_power_wait(struct snd_card *card, unsigned int state, stru
183#endif /* CONFIG_PM */ 183#endif /* CONFIG_PM */
184 184
185struct snd_minor { 185struct snd_minor {
186 struct list_head list; /* list of all minors per card */
187 int number; /* minor number */
188 int type; /* SNDRV_DEVICE_TYPE_XXX */ 186 int type; /* SNDRV_DEVICE_TYPE_XXX */
187 int card; /* card number */
189 int device; /* device number */ 188 int device; /* device number */
190 struct file_operations *f_ops; /* file operations */ 189 struct file_operations *f_ops; /* file operations */
191 char name[0]; /* device name (keep at the end of 190 char name[0]; /* device name (keep at the end of
@@ -217,11 +216,9 @@ int snd_minor_info_done(void);
217#ifdef CONFIG_SND_OSSEMUL 216#ifdef CONFIG_SND_OSSEMUL
218int snd_minor_info_oss_init(void); 217int snd_minor_info_oss_init(void);
219int snd_minor_info_oss_done(void); 218int snd_minor_info_oss_done(void);
220int snd_oss_init_module(void);
221#else 219#else
222#define snd_minor_info_oss_init() /*NOP*/ 220#define snd_minor_info_oss_init() /*NOP*/
223#define snd_minor_info_oss_done() /*NOP*/ 221#define snd_minor_info_oss_done() /*NOP*/
224#define snd_oss_init_module() 0
225#endif 222#endif
226 223
227/* memory.c */ 224/* memory.c */