Skip to contentSkip to conversation

ASoC: intel - fix the card names

PATCH Superseded Jaroslav Kysela 2 participants 3 messages Oct 26, 2019 – Oct 28, 2019

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Jaroslav Kysela

author maintainer
#0 lore raw

PATCH 1/1 ASoC: intel - fix the card names

Those strings are exposed to the user space as the card name thus used in the GUIs. The common standard is to avoid '_' here. The worst case is 'sof-skl_hda_card' string.

Cc Pierre-Louis Bossart <[email protected]>
Cc Mark Brown <[email protected]>
---
 sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 2 +-
 sound/soc/intel/boards/skl_hda_dsp_generic.c        | 2 +-
 sound/soc/intel/boards/sof_rt5682.c                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c +1 -1
index 74dda8784f1a..d14ca327c684 100644
@@ -623,7 +623,7 @@ static int kabylake_card_late_probe(struct snd_soc_card *card)
  * kabylake audio machine driver for  MAX98927 + RT5514 + RT5663
  */
 static struct snd_soc_card kabylake_audio_card = {
-	.name = "kbl_r5514_5663_max",
+	.name = "kbl-r5514-5663-max",
 	.owner = THIS_MODULE,
 	.dai_link = kabylake_dais,
 	.num_links = ARRAY_SIZE(kabylake_dais),
sound/soc/intel/boards/skl_hda_dsp_generic.c +1 -1
index 1778acdc367c..5261f7bf0b3b 100644
@@ -90,7 +90,7 @@ skl_hda_add_dai_link(struct snd_soc_card *card, struct snd_soc_dai_link *link)
 }
 
 static struct snd_soc_card hda_soc_card = {
-	.name = "skl_hda_card",
+	.name = "skl-hda",
 	.owner = THIS_MODULE,
 	.dai_link = skl_hda_be_dai_links,
 	.dapm_widgets = skl_hda_widgets,
sound/soc/intel/boards/sof_rt5682.c +1 -1
index 4f6e58c3954a..fc4638b8e03b 100644
@@ -370,7 +370,7 @@ static int dmic_init(struct snd_soc_pcm_runtime *rtd)
 
 /* sof audio machine driver for rt5682 codec */
 static struct snd_soc_card sof_audio_card_rt5682 = {
-	.name = "sof_rt5682",
+	.name = "sof-rt5682",
 	.owner = THIS_MODULE,
 	.controls = sof_controls,
 	.num_controls = ARRAY_SIZE(sof_controls),
Signature · 5 lines
2.20.1
_______________________________________________
Alsa-devel mailing list
[email protected]
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
#1 lore raw
Quoted 32 lines · Jaroslav Kysela

Those strings are exposed to the user space as the card name thus used in the GUIs. The common standard is to avoid '_' here. The worst case is 'sof-skl_hda_card' string.

Cc Pierre-Louis Bossart <[email protected]>
Cc Mark Brown <[email protected]>
---
  sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 2 +-
  sound/soc/intel/boards/skl_hda_dsp_generic.c        | 2 +-
  sound/soc/intel/boards/sof_rt5682.c                 | 2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c +1 -1
index 74dda8784f1a..d14ca327c684 100644
@@ -623,7 +623,7 @@ static int kabylake_card_late_probe(struct snd_soc_card *card)
   * kabylake audio machine driver for  MAX98927 + RT5514 + RT5663
   */
  static struct snd_soc_card kabylake_audio_card = {
-	.name = "kbl_r5514_5663_max",
+	.name = "kbl-r5514-5663-max",
  	.owner = THIS_MODULE,
  	.dai_link = kabylake_dais,
  	.num_links = ARRAY_SIZE(kabylake_dais),
sound/soc/intel/boards/skl_hda_dsp_generic.c +0 -0
index 1778acdc367c..5261f7bf0b3b 100644

sound/soc/intel/boards/skl_hda_dsp_generic.c skl_hda_add_dai_link(struct snd_soc_card *card, struct snd_soc_dai_link *link) · line 93

Quoted 5 lines
sound/soc/intel/boards/skl_hda_dsp_generic.c +1 -1
@@ -90,7 +90,7 @@ skl_hda_add_dai_link(struct snd_soc_card *card, struct snd_soc_dai_link *link)
  }
 
  static struct snd_soc_card hda_soc_card = {
-	.name = "skl_hda_card",
+	.name = "skl-hda",

well, if we are going to rename the cards, we might as well drop the 'skl' reference.

sound/soc/intel/boards/sof_rt5682.c static int dmic_init(struct snd_soc_pcm_runtime *rtd) · line 373

Quoted 13 lines
sound/soc/intel/boards/skl_hda_dsp_generic.c +0 -0
  	.owner = THIS_MODULE,
  	.dai_link = skl_hda_be_dai_links,
  	.dapm_widgets = skl_hda_widgets,
sound/soc/intel/boards/sof_rt5682.c +1 -1
index 4f6e58c3954a..fc4638b8e03b 100644
@@ -370,7 +370,7 @@ static int dmic_init(struct snd_soc_pcm_runtime *rtd)
 
  /* sof audio machine driver for rt5682 codec */
  static struct snd_soc_card sof_audio_card_rt5682 = {
-	.name = "sof_rt5682",
+	.name = "sof-rt5682",

and the sof prefix is also a mistake. the card will end-up being named sof-sof-rt5682

sound/soc/intel/boards/sof_rt5682.c static int dmic_init(struct snd_soc_pcm_runtime *rtd) · line 376

Quoted 4 lines
sound/soc/intel/boards/sof_rt5682.c +0 -0
  	.owner = THIS_MODULE,
  	.controls = sof_controls,
  	.num_controls = ARRAY_SIZE(sof_controls),

_______________________________________________
Alsa-devel mailing list
[email protected]
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

author maintainer
#2 lore raw

Dne 28. 10. 19 v 2:44 Pierre-Louis Bossart napsal(a):

Quoted 37 lines · Jaroslav Kysela
Quoted 34 lines

Those strings are exposed to the user space as the card name thus used in the GUIs. The common standard is to avoid '_' here. The worst case is 'sof-skl_hda_card' string.

Cc Pierre-Louis Bossart <[email protected]>
Cc Mark Brown <[email protected]>
---
   sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 2 +-
   sound/soc/intel/boards/skl_hda_dsp_generic.c        | 2 +-
   sound/soc/intel/boards/sof_rt5682.c                 | 2 +-
   3 files changed, 3 insertions(+), 3 deletions(-)
sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c +1 -1
index 74dda8784f1a..d14ca327c684 100644
@@ -623,7 +623,7 @@ static int kabylake_card_late_probe(struct snd_soc_card *card)
    * kabylake audio machine driver for  MAX98927 + RT5514 + RT5663
    */
   static struct snd_soc_card kabylake_audio_card = {
-	.name = "kbl_r5514_5663_max",
+	.name = "kbl-r5514-5663-max",
   	.owner = THIS_MODULE,
   	.dai_link = kabylake_dais,
   	.num_links = ARRAY_SIZE(kabylake_dais),
sound/soc/intel/boards/skl_hda_dsp_generic.c +0 -0
index 1778acdc367c..5261f7bf0b3b 100644
@@ -90,7 +90,7 @@ skl_hda_add_dai_link(struct snd_soc_card *card, struct snd_soc_dai_link *link)
   }
 
Quoted 6 lines

sound/soc/intel/boards/skl_hda_dsp_generic.c skl_hda_add_dai_link(struct snd_soc_card *card, struct snd_soc_dai_link *link) · line 93

Quoted 3 lines
sound/soc/intel/boards/skl_hda_dsp_generic.c +1 -1
   static struct snd_soc_card hda_soc_card = {
-	.name = "skl_hda_card",
+	.name = "skl-hda",

well, if we are going to rename the cards, we might as well drop the 'skl' reference.

I sent v2 with the "hda-dsp" name..

Quoted 10 lines
Quoted 10 lines
sound/soc/intel/boards/skl_hda_dsp_generic.c +0 -0
   	.owner = THIS_MODULE,
   	.dai_link = skl_hda_be_dai_links,
   	.dapm_widgets = skl_hda_widgets,
sound/soc/intel/boards/sof_rt5682.c +0 -0
index 4f6e58c3954a..fc4638b8e03b 100644
@@ -370,7 +370,7 @@ static int dmic_init(struct snd_soc_pcm_runtime *rtd)
 
Quoted 7 lines

sound/soc/intel/boards/sof_rt5682.c static int dmic_init(struct snd_soc_pcm_runtime *rtd) · line 373

Quoted 4 lines
sound/soc/intel/boards/sof_rt5682.c +1 -1
   /* sof audio machine driver for rt5682 codec */
   static struct snd_soc_card sof_audio_card_rt5682 = {
-	.name = "sof_rt5682",
+	.name = "sof-rt5682",

and the sof prefix is also a mistake. the card will end-up being named sof-sof-rt5682

Okay, removed in v2.

Thanks,
Jaroslav

Quoted 5 lines
Quoted 5 lines
sound/soc/intel/boards/sof_rt5682.c +0 -0
   	.owner = THIS_MODULE,
   	.controls = sof_controls,
   	.num_controls = ARRAY_SIZE(sof_controls),
Signature · 6 lines
Jaroslav Kysela <[email protected]>
Linux Sound Maintainer; ALSA Project; Red Hat, Inc.
_______________________________________________
Alsa-devel mailing list
[email protected]
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel