[alsa-devel] [PATCH 1/2] ASoC: Set up debugfs only once per CODEC

[Peter Ujfalusi]

On Thursday 12 August 2010 17:50:31 ext Mark Brown wrote:
> Since the debugfs directory is current per CODEC we should only init
> it when the CODEC is initialised, otherwise we end up with errors
> being generated when an attempt is made to add duplicate debugfs
> entries.

But if you move the init of debugfs where you have moved it, than the machine 
driver given DAPM widgets will have no debugfs entries, since the machine init 
is going to be called later (dai_link->init)...

> 
> Since most of this stuff is actually for the card we should refactor
> but this can come later.

Sure, refactoring will help, but with this change we have missing debugfs files 
for widgets, which is kind of confusing.

-- 
Péter

> 
> Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
> ---
>  sound/soc/soc-core.c |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
> index a004876..ac0fa22 100644
> --- a/sound/soc/soc-core.c
> +++ b/sound/soc/soc-core.c
> @@ -1323,6 +1323,9 @@ static int soc_probe_dai_link(struct snd_soc_card
> *card, int num) return ret;
>  			}
>  		}
> +
> +		soc_init_codec_debugfs(codec);
> +
>  		/* mark codec as probed and add to card codec list */
>  		codec->probed = 1;
>  		list_add(&codec->card_list, &card->codec_dev_list);
> @@ -1400,8 +1403,6 @@ static int soc_probe_dai_link(struct snd_soc_card
> *card, int num) if (ret < 0)
>  		printk(KERN_WARNING "asoc: failed to add codec sysfs files\n");
> 
> -	soc_init_codec_debugfs(codec);
> -
>  	/* create the pcm */
>  	ret = soc_new_pcm(rtd, num);
>  	if (ret < 0) {