[alsa-devel] [PATCH] ASoC: Remove extra rtd->dev.init_name assignment in soc_probe_dai_link

Liam Girdwood lrg at slimlogic.co.uk
Tue Sep 21 15:07:06 CEST 2010


On Tue, 2010-09-21 at 15:36 +0300, Jarkko Nikula wrote:
> rtd->dev.init_name is set twice in soc_probe_dai_link. I removed the first
> assignement from dai_link->stream_name since then there won't be sysfs name
> changes and usually dai_link->name seems to fit anyway better for a sysfs
> directory name.
> 
> Signed-off-by: Jarkko Nikula <jhnikula at gmail.com>
> ---
>  sound/soc/soc-core.c |    1 -
>  1 files changed, 0 insertions(+), 1 deletions(-)
> 
> diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
> index 6001b7f..c8d1596 100644
> --- a/sound/soc/soc-core.c
> +++ b/sound/soc/soc-core.c
> @@ -1451,7 +1451,6 @@ static int soc_probe_dai_link(struct snd_soc_card *card, int num)
>  	snd_soc_dapm_sync(codec);
>  
>  	/* register the rtd device */
> -	rtd->dev.init_name = rtd->dai_link->stream_name;
>  	rtd->dev.release = rtd_release;
>  	rtd->dev.init_name = dai_link->name;
>  	ret = device_register(&rtd->dev);

Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
-- 
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk



More information about the Alsa-devel mailing list