| Message ID | 20191026074110.22196-1-perex@perex.cz (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ASoC: intel - fix the card names | expand |
On 10/26/19 2:41 AM, Jaroslav Kysela wrote: > 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. > > Signed-off-by: Jaroslav Kysela <perex@perex.cz> > Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > Cc: Mark Brown <broonie@kernel.org> > --- > 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(-) > > diff --git a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c > index 74dda8784f1a..d14ca327c684 100644 > --- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c > +++ b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c > @@ -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), > diff --git a/sound/soc/intel/boards/skl_hda_dsp_generic.c b/sound/soc/intel/boards/skl_hda_dsp_generic.c > index 1778acdc367c..5261f7bf0b3b 100644 > --- a/sound/soc/intel/boards/skl_hda_dsp_generic.c > +++ b/sound/soc/intel/boards/skl_hda_dsp_generic.c > @@ -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. > .owner = THIS_MODULE, > .dai_link = skl_hda_be_dai_links, > .dapm_widgets = skl_hda_widgets, > diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c > index 4f6e58c3954a..fc4638b8e03b 100644 > --- a/sound/soc/intel/boards/sof_rt5682.c > +++ b/sound/soc/intel/boards/sof_rt5682.c > @@ -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 > .owner = THIS_MODULE, > .controls = sof_controls, > .num_controls = ARRAY_SIZE(sof_controls), >
Dne 28. 10. 19 v 2:44 Pierre-Louis Bossart napsal(a): > > > On 10/26/19 2:41 AM, Jaroslav Kysela wrote: >> 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. >> >> Signed-off-by: Jaroslav Kysela <perex@perex.cz> >> Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> >> Cc: Mark Brown <broonie@kernel.org> >> --- >> 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(-) >> >> diff --git a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c >> index 74dda8784f1a..d14ca327c684 100644 >> --- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c >> +++ b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c >> @@ -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), >> diff --git a/sound/soc/intel/boards/skl_hda_dsp_generic.c b/sound/soc/intel/boards/skl_hda_dsp_generic.c >> index 1778acdc367c..5261f7bf0b3b 100644 >> --- a/sound/soc/intel/boards/skl_hda_dsp_generic.c >> +++ b/sound/soc/intel/boards/skl_hda_dsp_generic.c >> @@ -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. I sent v2 with the "hda-dsp" name.. > >> .owner = THIS_MODULE, >> .dai_link = skl_hda_be_dai_links, >> .dapm_widgets = skl_hda_widgets, >> diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c >> index 4f6e58c3954a..fc4638b8e03b 100644 >> --- a/sound/soc/intel/boards/sof_rt5682.c >> +++ b/sound/soc/intel/boards/sof_rt5682.c >> @@ -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 Okay, removed in v2. Thanks, Jaroslav > >> .owner = THIS_MODULE, >> .controls = sof_controls, >> .num_controls = ARRAY_SIZE(sof_controls), >>
diff --git a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c index 74dda8784f1a..d14ca327c684 100644 --- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c +++ b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c @@ -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), diff --git a/sound/soc/intel/boards/skl_hda_dsp_generic.c b/sound/soc/intel/boards/skl_hda_dsp_generic.c index 1778acdc367c..5261f7bf0b3b 100644 --- a/sound/soc/intel/boards/skl_hda_dsp_generic.c +++ b/sound/soc/intel/boards/skl_hda_dsp_generic.c @@ -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, diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c index 4f6e58c3954a..fc4638b8e03b 100644 --- a/sound/soc/intel/boards/sof_rt5682.c +++ b/sound/soc/intel/boards/sof_rt5682.c @@ -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),
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. Signed-off-by: Jaroslav Kysela <perex@perex.cz> Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Cc: Mark Brown <broonie@kernel.org> --- 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(-)