mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 22:21:40 +00:00
ALSA: seq: Create device with snd_device_alloc()
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>
This commit is contained in:
parent
911fcb76e3
commit
2419891e3f
@ -2721,7 +2721,7 @@ static const struct file_operations snd_seq_f_ops =
|
|||||||
.compat_ioctl = snd_seq_ioctl_compat,
|
.compat_ioctl = snd_seq_ioctl_compat,
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct device seq_dev;
|
static struct device *seq_dev;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* register sequencer device
|
* register sequencer device
|
||||||
@ -2730,15 +2730,17 @@ int __init snd_sequencer_device_init(void)
|
|||||||
{
|
{
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
snd_device_initialize(&seq_dev, NULL);
|
err = snd_device_alloc(&seq_dev, NULL);
|
||||||
dev_set_name(&seq_dev, "seq");
|
if (err < 0)
|
||||||
|
return err;
|
||||||
|
dev_set_name(seq_dev, "seq");
|
||||||
|
|
||||||
mutex_lock(®ister_mutex);
|
mutex_lock(®ister_mutex);
|
||||||
err = snd_register_device(SNDRV_DEVICE_TYPE_SEQUENCER, NULL, 0,
|
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(®ister_mutex);
|
mutex_unlock(®ister_mutex);
|
||||||
if (err < 0) {
|
if (err < 0) {
|
||||||
put_device(&seq_dev);
|
put_device(seq_dev);
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2752,6 +2754,6 @@ int __init snd_sequencer_device_init(void)
|
|||||||
*/
|
*/
|
||||||
void snd_sequencer_device_done(void)
|
void snd_sequencer_device_done(void)
|
||||||
{
|
{
|
||||||
snd_unregister_device(&seq_dev);
|
snd_unregister_device(seq_dev);
|
||||||
put_device(&seq_dev);
|
put_device(seq_dev);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user