iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ALSA] Clean up snd_card_free*()

Browse Source 
A little clean up of snd_card_free*().
Removed snd_card_free_prepare() since it's actually almost identical
with snd_card_disconnect().

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2008-04-17 12:52:02 +02:00
parent 73d38b13ff
commit f18638dcf0
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sound/core/init.c
View File

@ -311,6 +311,9 @@ int snd_card_disconnect(struct snd_card *card)
struct file *file; struct file *file;
int err; int err;
if (!card)
return -EINVAL;
spin_lock(&card->files_lock); spin_lock(&card->files_lock);
if (card->shutdown) { if (card->shutdown) {
spin_unlock(&card->files_lock); spin_unlock(&card->files_lock);
@ -322,6 +325,7 @@ int snd_card_disconnect(struct snd_card *card)
/* phase 1: disable fops (user space) operations for ALSA API */ /* phase 1: disable fops (user space) operations for ALSA API */
mutex_lock(&snd_card_mutex); mutex_lock(&snd_card_mutex);
snd_cards[card->number] = NULL; snd_cards[card->number] = NULL;
snd_cards_lock &= ~(1 << card->number);
mutex_unlock(&snd_card_mutex); mutex_unlock(&snd_card_mutex);
/* phase 2: replace file->f_op with special dummy operations */ /* phase 2: replace file->f_op with special dummy operations */
@ -365,6 +369,9 @@ int snd_card_disconnect(struct snd_card *card)
device_unregister(card->card_dev); device_unregister(card->card_dev);
card->card_dev = NULL; card->card_dev = NULL;
} }
#endif
#ifdef CONFIG_PM
wake_up(&card->power_sleep);
#endif #endif
return 0; return 0;
} }
@ -411,25 +418,10 @@ static int snd_card_do_free(struct snd_card *card)
return 0; return 0;
} }
static int snd_card_free_prepare(struct snd_card *card)
{
if (card == NULL)
return -EINVAL;
(void) snd_card_disconnect(card);
mutex_lock(&snd_card_mutex);
snd_cards[card->number] = NULL;
snd_cards_lock &= ~(1 << card->number);
mutex_unlock(&snd_card_mutex);
#ifdef CONFIG_PM
wake_up(&card->power_sleep);
#endif
return 0;
}
int snd_card_free_when_closed(struct snd_card *card) int snd_card_free_when_closed(struct snd_card *card)
{ {
int free_now = 0; int free_now = 0;
int ret = snd_card_free_prepare(card); int ret = snd_card_disconnect(card);
if (ret) if (ret)
return ret; return ret;
@ -449,7 +441,7 @@ EXPORT_SYMBOL(snd_card_free_when_closed);
int snd_card_free(struct snd_card *card) int snd_card_free(struct snd_card *card)
{ {
int ret = snd_card_free_prepare(card); int ret = snd_card_disconnect(card);
if (ret) if (ret)
return ret; return ret;