ALSA: Consolidate snd_find_free_minor()

A really small cleanup to consolidate snd_find_free_minor() and
snd_kernel_minor() so that we can get rid of one more ifdef.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/core/sound.c b/sound/core/sound.c
index 185cec01ee258cceea232209c24b8aa5478b300b..5fc93d00572a5fc4f9ecfa3ba070aa2b3b8efb6f 100644 (file)
--- a/sound/core/sound.c
+++ b/sound/core/sound.c
@@ -186,7 +186,7 @@ static const struct file_operations snd_fops =
 };
 
 #ifdef CONFIG_SND_DYNAMIC_MINORS
-static int snd_find_free_minor(int type)
+static int snd_find_free_minor(int type, struct snd_card *card, int dev)
 {
        int minor;
 
@@ -209,7 +209,7 @@ static int snd_find_free_minor(int type)
        return -EBUSY;
 }
 #else
-static int snd_kernel_minor(int type, struct snd_card *card, int dev)
+static int snd_find_free_minor(int type, struct snd_card *card, int dev)
 {
        int minor;
 
@@ -237,6 +237,8 @@ static int snd_kernel_minor(int type, struct snd_card *card, int dev)
        }
        if (snd_BUG_ON(minor < 0 || minor >= SNDRV_OS_MINORS))
                return -EINVAL;
+       if (snd_minors[minor])
+               return -EBUSY;
        return minor;
 }
 #endif
@@ -276,13 +278,7 @@ int snd_register_device(int type, struct snd_card *card, int dev,
        preg->private_data = private_data;
        preg->card_ptr = card;
        mutex_lock(&sound_mutex);
-#ifdef CONFIG_SND_DYNAMIC_MINORS
-       minor = snd_find_free_minor(type);
-#else
-       minor = snd_kernel_minor(type, card, dev);
-       if (minor >= 0 && snd_minors[minor])
-               minor = -EBUSY;
-#endif
+       minor = snd_find_free_minor(type, card, dev);
        if (minor < 0) {
                err = minor;
                goto error;