[ALSA] dynamic minors (3/6): store device-specific object pointers dynamically

Instead of storing the pointers to the device-specific structures in an
array, put them into the struct snd_minor, and look them up dynamically.

This makes the device type modules independent of the minor number
encoding.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>

4 files changed, 12 insertions, 6 deletions

diff --git a/include/sound/core.h b/include/sound/core.h
index 67b0a7e764e7..90ac6132ea3b 100644
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -187,6 +187,7 @@ struct snd_minor {
         int card;                       /* card number */
         int device;                     /* device number */
         struct file_operations *f_ops;  /* file operations */
+        void *private_data;             /* private data for f_ops->open */
         char name[0];                   /* device name (keep at the end of
                                                                 structure) */
 };
@@ -199,13 +200,17 @@ extern int snd_ecards_limit;
 void snd_request_card(int card);
 
 int snd_register_device(int type, struct snd_card *card, int dev,
-                        struct file_operations *f_ops, const char *name);
+                        struct file_operations *f_ops, void *private_data,
+                        const char *name);
 int snd_unregister_device(int type, struct snd_card *card, int dev);
+void *snd_lookup_minor_data(unsigned int minor, int type);
 
 #ifdef CONFIG_SND_OSSEMUL
 int snd_register_oss_device(int type, struct snd_card *card, int dev,
-                            struct file_operations *f_ops, const char *name);
+                            struct file_operations *f_ops, void *private_data,
+                            const char *name);
 int snd_unregister_oss_device(int type, struct snd_card *card, int dev);
+void *snd_lookup_oss_minor_data(unsigned int minor, int type);
 #endif
 
 int snd_minor_info_init(void);
diff --git a/include/sound/hwdep.h b/include/sound/hwdep.h
index 04b20bc4f144..c679e5b31111 100644
--- a/include/sound/hwdep.h
+++ b/include/sound/hwdep.h
@@ -43,6 +43,7 @@ struct snd_hwdep_ops {
 
 struct snd_hwdep {
         struct snd_card *card;
+        struct list_head list;
         int device;
         char id[32];
         char name[80];
diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index 5e29b0e0f214..314268a11048 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -412,6 +412,7 @@ struct snd_pcm_str {
 
 struct snd_pcm {
         struct snd_card *card;
+        struct list_head list;
         unsigned int device;    /* device number */
         unsigned int info_flags;
         unsigned short dev_class;
@@ -439,7 +440,6 @@ struct snd_pcm_notify {
  *  Registering
  */
 
-extern struct snd_pcm *snd_pcm_devices[];
 extern struct file_operations snd_pcm_f_ops[2];
 
 int snd_pcm_new(struct snd_card *card, char *id, int device,
diff --git a/include/sound/rawmidi.h b/include/sound/rawmidi.h
index 9492a32c1026..d19bddfbf995 100644
--- a/include/sound/rawmidi.h
+++ b/include/sound/rawmidi.h
@@ -113,7 +113,7 @@ struct snd_rawmidi_str {
 
 struct snd_rawmidi {
         struct snd_card *card;
-
+        struct list_head list;
         unsigned int device;            /* device number */
         unsigned int info_flags;        /* SNDRV_RAWMIDI_INFO_XXXX */
         char id[64];
@@ -165,8 +165,8 @@ int snd_rawmidi_transmit(struct snd_rawmidi_substream *substream,
 /* main midi functions */
 
 int snd_rawmidi_info_select(struct snd_card *card, struct snd_rawmidi_info *info);
-int snd_rawmidi_kernel_open(int cardnum, int device, int subdevice, int mode,
-                            struct snd_rawmidi_file *rfile);
+int snd_rawmidi_kernel_open(struct snd_card *card, int device, int subdevice,
+                            int mode, struct snd_rawmidi_file *rfile);
 int snd_rawmidi_kernel_release(struct snd_rawmidi_file *rfile);
 int snd_rawmidi_output_params(struct snd_rawmidi_substream *substream,
                               struct snd_rawmidi_params *params);