Skip to contentSkip to conversation

ASoC: Remove extra rtd->dev.init_name assignment in soc_probe_dai_link

PATCH Applied Jarkko Nikula 3 participants 3 messages Sep 21, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: Remove extra rtd->dev.init_name assignment in soc_probe_dai_link

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.

---
 sound/soc/soc-core.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
sound/soc/soc-core.c +0 -1
index 6001b7f..c8d1596 100644
@@ -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);
Signature · 1 line
1.7.1
Acked-by on v1 1/1
#1 lore raw
Quoted 15 lines · Jarkko Nikula

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.

---
 sound/soc/soc-core.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
sound/soc/soc-core.c +0 -0
index 6001b7f..c8d1596 100644

sound/soc/soc-core.c static int soc_probe_dai_link(struct snd_soc_card *card, int num) · line 1456

Quoted 7 lines
sound/soc/soc-core.c +0 -1
@@ -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);
Signature · 3 lines
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk
Applied
#2 lore raw
In reply to Jarkko Nikula
Quoted 6 lines · Jarkko Nikula

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.

Applied, thanks.