ALSA: seq: Create device with snd_device_alloc()
authorTakashi Iwai <tiwai@suse.de>
Wed, 16 Aug 2023 16:02:51 +0000 (18:02 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 17 Aug 2023 07:24:28 +0000 (09:24 +0200)
Align with the other components, and use snd_device_alloc() for the
new sound device for sequencer, too.  No functional changes.

Reviewed-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Curtis Malainey <cujomalainey@chromium.org>
Tested-by: Curtis Malainey <cujomalainey@chromium.org>
Link: https://lore.kernel.org/r/20230816160252.23396-9-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/core/seq/seq_clientmgr.c

index e3f9ea6..42a7051 100644 (file)
@@ -2721,7 +2721,7 @@ static const struct file_operations snd_seq_f_ops =
        .compat_ioctl = snd_seq_ioctl_compat,
 };
 
-static struct device seq_dev;
+static struct device *seq_dev;
 
 /* 
  * register sequencer device 
@@ -2730,15 +2730,17 @@ int __init snd_sequencer_device_init(void)
 {
        int err;
 
-       snd_device_initialize(&seq_dev, NULL);
-       dev_set_name(&seq_dev, "seq");
+       err = snd_device_alloc(&seq_dev, NULL);
+       if (err < 0)
+               return err;
+       dev_set_name(seq_dev, "seq");
 
        mutex_lock(&register_mutex);
        err = snd_register_device(SNDRV_DEVICE_TYPE_SEQUENCER, NULL, 0,
-                                 &snd_seq_f_ops, NULL, &seq_dev);
+                                 &snd_seq_f_ops, NULL, seq_dev);
        mutex_unlock(&register_mutex);
        if (err < 0) {
-               put_device(&seq_dev);
+               put_device(seq_dev);
                return err;
        }
        
@@ -2752,6 +2754,6 @@ int __init snd_sequencer_device_init(void)
  */
 void snd_sequencer_device_done(void)
 {
-       snd_unregister_device(&seq_dev);
-       put_device(&seq_dev);
+       snd_unregister_device(seq_dev);
+       put_device(seq_dev);
 }