[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>

3 files changed, 11 insertions, 5 deletions

diff --git a/sound/core/seq/oss/seq_oss.c b/sound/core/seq/oss/seq_oss.c
index 61c0a41376f..4b51ab56507 100644
--- a/sound/core/seq/oss/seq_oss.c
+++ b/sound/core/seq/oss/seq_oss.c
@@ -225,7 +225,7 @@ register_device(void)
         down(&register_mutex);
         if ((rc = snd_register_oss_device(SNDRV_OSS_DEVICE_TYPE_SEQUENCER,
                                           NULL, 0,
-                                          &seq_oss_f_ops,
+                                          &seq_oss_f_ops, NULL,
                                           SNDRV_SEQ_OSS_DEVNAME)) < 0) {
                 snd_printk(KERN_ERR "can't register device seq\n");
                 up(&register_mutex);
@@ -233,7 +233,7 @@ register_device(void)
         }
         if ((rc = snd_register_oss_device(SNDRV_OSS_DEVICE_TYPE_MUSIC,
                                           NULL, 0,
-                                          &seq_oss_f_ops,
+                                          &seq_oss_f_ops, NULL,
                                           SNDRV_SEQ_OSS_DEVNAME)) < 0) {
                 snd_printk(KERN_ERR "can't register device music\n");
                 snd_unregister_oss_device(SNDRV_OSS_DEVICE_TYPE_SEQUENCER, NULL, 0);
diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c
index 087fdf32732..c8bd37ee837 100644
--- a/sound/core/seq/seq_clientmgr.c
+++ b/sound/core/seq/seq_clientmgr.c
@@ -2531,7 +2531,7 @@ int __init snd_sequencer_device_init(void)
                 return -ERESTARTSYS;
 
         if ((err = snd_register_device(SNDRV_DEVICE_TYPE_SEQUENCER, NULL, 0,
-                                       &snd_seq_f_ops, "seq")) < 0) {
+                                       &snd_seq_f_ops, NULL, "seq")) < 0) {
                 up(&register_mutex);
                 return err;
         }
diff --git a/sound/core/seq/seq_midi.c b/sound/core/seq/seq_midi.c
index f88d2e3ee66..0a65eb2f976 100644
--- a/sound/core/seq/seq_midi.c
+++ b/sound/core/seq/seq_midi.c
@@ -183,7 +183,10 @@ static int midisynth_subscribe(void *private_data, struct snd_seq_port_subscribe
         struct snd_rawmidi_params params;
 
         /* open midi port */
-        if ((err = snd_rawmidi_kernel_open(msynth->card->number, msynth->device, msynth->subdevice, SNDRV_RAWMIDI_LFLG_INPUT, &msynth->input_rfile)) < 0) {
+        if ((err = snd_rawmidi_kernel_open(msynth->card, msynth->device,
+                                           msynth->subdevice,
+                                           SNDRV_RAWMIDI_LFLG_INPUT,
+                                           &msynth->input_rfile)) < 0) {
                 snd_printd("midi input open failed!!!\n");
                 return err;
         }
@@ -221,7 +224,10 @@ static int midisynth_use(void *private_data, struct snd_seq_port_subscribe *info
         struct snd_rawmidi_params params;
 
         /* open midi port */
-        if ((err = snd_rawmidi_kernel_open(msynth->card->number, msynth->device, msynth->subdevice, SNDRV_RAWMIDI_LFLG_OUTPUT, &msynth->output_rfile)) < 0) {
+        if ((err = snd_rawmidi_kernel_open(msynth->card, msynth->device,
+                                           msynth->subdevice,
+                                           SNDRV_RAWMIDI_LFLG_OUTPUT,
+                                           &msynth->output_rfile)) < 0) {
                 snd_printd("midi output open failed!!!\n");
                 return err;
         }