ALSA: Simplify snd_device_register() variants
Now that all callers have been replaced with
snd_device_register_for_dev(), let's drop the obsolete device
registration code and concentrate only on the code handling struct
device directly. That said,
- remove the old snd_device_register(),
- rename snd_device_register_for_dev() with snd_device_register(),
- drop superfluous arguments from snd_device_register(),
- change snd_unregister_device() to pass the device pointer directly
Reviewed-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
diff --git a/sound/core/control.c b/sound/core/control.c
index e214fab..60caba1 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -1661,9 +1661,8 @@
{
struct snd_card *card = device->device_data;
- return snd_register_device_for_dev(SNDRV_DEVICE_TYPE_CONTROL, card,
- -1, &snd_ctl_f_ops, card,
- &card->ctl_dev, NULL, NULL);
+ return snd_register_device(SNDRV_DEVICE_TYPE_CONTROL, card, -1,
+ &snd_ctl_f_ops, card, &card->ctl_dev);
}
/*
@@ -1681,7 +1680,7 @@
}
read_unlock(&card->ctl_files_rwlock);
- return snd_unregister_device(SNDRV_DEVICE_TYPE_CONTROL, card, -1);
+ return snd_unregister_device(&card->ctl_dev);
}
/*