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

ALSA: info: Always register entries recursively

Browse Source 
Make sure that all children entries are registered by a single call of
snd_info_register().  OTOH, don't register if a parent isn't
registered yet.

This allows us to create the whole procfs tree in a shot at the last
stage of card registration phase in a later patch.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai
2019-02-05 12:31:42 +01:00
parent 6ce1d63ed7
commit 348c5ad5d6
1 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
sound/core/info.c
View File

@ -523,27 +523,6 @@ int snd_info_card_create(struct snd_card *card)
return 0; return 0;
} }
/* register all pending info entries */
static int snd_info_register_recursive(struct snd_info_entry *entry)
{
struct snd_info_entry *p;
int err;
if (!entry->p) {
err = snd_info_register(entry);
if (err < 0)
return err;
}
list_for_each_entry(p, &entry->children, list) {
err = snd_info_register_recursive(p);
if (err < 0)
return err;
}
return 0;
}
/* /*
* register the card proc file * register the card proc file
* called from init.c * called from init.c
@ -557,7 +536,7 @@ int snd_info_card_register(struct snd_card *card)
if (snd_BUG_ON(!card)) if (snd_BUG_ON(!card))
return -ENXIO; return -ENXIO;
err = snd_info_register_recursive(card->proc_root); err = snd_info_register(card->proc_root);
if (err < 0) if (err < 0)
return err; return err;
@ -821,15 +800,7 @@ void snd_info_free_entry(struct snd_info_entry * entry)
} }
EXPORT_SYMBOL(snd_info_free_entry); EXPORT_SYMBOL(snd_info_free_entry);
/** static int __snd_info_register(struct snd_info_entry *entry)
* snd_info_register - register the info entry
* @entry: the info entry
*
* Registers the proc info entry.
*
* Return: Zero if successful, or a negative error code on failure.
*/
int snd_info_register(struct snd_info_entry * entry)
{ {
struct proc_dir_entry *root, *p = NULL; struct proc_dir_entry *root, *p = NULL;
@ -837,6 +808,8 @@ int snd_info_register(struct snd_info_entry * entry)
return -ENXIO; return -ENXIO;
root = entry->parent == NULL ? snd_proc_root->p : entry->parent->p; root = entry->parent == NULL ? snd_proc_root->p : entry->parent->p;
mutex_lock(&info_mutex); mutex_lock(&info_mutex);
if (entry->p || !root)
goto unlock;
if (S_ISDIR(entry->mode)) { if (S_ISDIR(entry->mode)) {
p = proc_mkdir_mode(entry->name, entry->mode, root); p = proc_mkdir_mode(entry->name, entry->mode, root);
if (!p) { if (!p) {
@ -858,9 +831,39 @@ int snd_info_register(struct snd_info_entry * entry)
proc_set_size(p, entry->size); proc_set_size(p, entry->size);
} }
entry->p = p; entry->p = p;
unlock:
mutex_unlock(&info_mutex); mutex_unlock(&info_mutex);
return 0; return 0;
} }
/**
* snd_info_register - register the info entry
* @entry: the info entry
*
* Registers the proc info entry.
* The all children entries are registered recursively.
*
* Return: Zero if successful, or a negative error code on failure.
*/
int snd_info_register(struct snd_info_entry *entry)
{
struct snd_info_entry *p;
int err;
if (!entry->p) {
err = __snd_info_register(entry);
if (err < 0)
return err;
}
list_for_each_entry(p, &entry->children, list) {
err = snd_info_register(p);
if (err < 0)
return err;
}
return 0;
}
EXPORT_SYMBOL(snd_info_register); EXPORT_SYMBOL(snd_info_register);
/* /*