Unverified Commit d745cc1a authored by Jaroslav Kysela's avatar Jaroslav Kysela Committed by Mark Brown
Browse files

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.

Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Cc: Mark Brown <broonie@kernel.org>
Acked-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20191028164624.14334-1-perex@perex.cz


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 6d407a39

sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c

+1 −1
Original line number Diff line number Diff line
@@ -737,7 +737,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
Original line number Diff line number Diff line
@@ -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 = "hda-dsp",

	.owner = THIS_MODULE,

	.dai_link = skl_hda_be_dai_links,

	.dapm_widgets = skl_hda_widgets,

sound/soc/intel/boards/sof_rt5682.c

+1 −1
Original line number Diff line number Diff line
@@ -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 = "rt5682", /* the sof- prefix is added by the core */

	.owner = THIS_MODULE,

	.controls = sof_controls,

	.num_controls = ARRAY_SIZE(sof_controls),