FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-05 17:01:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ALSA: Consolidate snd_find_free_minor()

Browse Source 
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>
This commit is contained in:
Takashi Iwai 2015-02-06 14:45:33 +01:00
parent b62b998010
commit 38ebb70349
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sound/core/sound.c
View File

@ -186,7 +186,7 @@ static const struct file_operations snd_fops =
}; };
#ifdef CONFIG_SND_DYNAMIC_MINORS #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; int minor;
@ -209,7 +209,7 @@ static int snd_find_free_minor(int type)
return -EBUSY; return -EBUSY;
} }
#else #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; 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)) if (snd_BUG_ON(minor < 0 || minor >= SNDRV_OS_MINORS))
return -EINVAL; return -EINVAL;
if (snd_minors[minor])
return -EBUSY;
return minor; return minor;
} }
#endif #endif
@ -276,13 +278,7 @@ int snd_register_device(int type, struct snd_card *card, int dev,
preg->private_data = private_data; preg->private_data = private_data;
preg->card_ptr = card; preg->card_ptr = card;
mutex_lock(&sound_mutex); mutex_lock(&sound_mutex);
#ifdef CONFIG_SND_DYNAMIC_MINORS minor = snd_find_free_minor(type, card, dev);
minor = snd_find_free_minor(type);
#else
minor = snd_kernel_minor(type, card, dev);
if (minor >= 0 && snd_minors[minor])
minor = -EBUSY;
#endif
if (minor < 0) { if (minor < 0) {
err = minor; err = minor;
goto error; goto error;