Commit 861886d3 authored Apr 24, 2017 by Takashi Iwai Committed by Mark Brown Apr 24, 2017

ASoC: Call snd_soc_set_dmi_name() unconditionally



Since recently UCM can pick up a configuration specific to the board
via card longname field, and we introduced a helper function
snd_soc_set_dmi_name() for that.  So far, it was used only in one
place (sound/soc/intel/boards/broadwell.c), but it should be more
widely applied.

This patch puts a big hammer for that: it lets snd_soc_register_card()
calling snd_soc_set_dmi_name() unconditionally, so that all x86
devices get the better longname string.  This would have no impact for
other systems without DMI support, as snd_soc_set_dmi_name() is no-op
on them.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Acked-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent 1f5a4535

sound/soc/intel/boards/broadwell.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -269,9 +269,6 @@ static struct snd_soc_card broadwell_rt286 = {
		static int broadwell_audio_probe(struct platform_device *pdev)
		{
		broadwell_rt286.dev = &pdev->dev;

		snd_soc_set_dmi_name(&broadwell_rt286, NULL);

		return devm_snd_soc_register_card(&pdev->dev, &broadwell_rt286);
		}

sound/soc/soc-core.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -2192,6 +2192,9 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
		snd_soc_dapm_add_routes(&card->dapm, card->of_dapm_routes,
		card->num_of_dapm_routes);

		/* try to set some sane longname if DMI is available */
		snd_soc_set_dmi_name(card, NULL);

		snprintf(card->snd_card->shortname, sizeof(card->snd_card->shortname),
		"%s", card->name);
		snprintf(card->snd_card->longname, sizeof(card->snd_card->longname),

Admin message