Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f5a4535 authored by Takashi Iwai's avatar Takashi Iwai Committed by Mark Brown
Browse files

ASoC: Provide a dummy wrapper of snd_soc_set_dmi_name() 



For systems without DMI, it makes no sense to have the code.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Acked-by: default avatarLiam Girdwood <liam.r.girdwood@linux.intel.com>
Acked-by: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 550b349a

include/sound/soc.h

+8 −0
Original line number Diff line number Diff line
@@ -497,7 +497,15 @@ void snd_soc_runtime_deactivate(struct snd_soc_pcm_runtime *rtd, int stream); 
int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd,

	unsigned int dai_fmt);



#ifdef CONFIG_DMI

int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour);

#else

static inline int snd_soc_set_dmi_name(struct snd_soc_card *card,

				       const char *flavour)

{

	return 0;

}

#endif



/* Utility functions to get clock rates from various things */

int snd_soc_calc_frame_size(int sample_size, int channels, int tdm_slots);

sound/soc/soc-core.c

+2 −0
Original line number Diff line number Diff line
@@ -1918,6 +1918,7 @@ int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd, 
EXPORT_SYMBOL_GPL(snd_soc_runtime_set_dai_fmt);





#ifdef CONFIG_DMI

/* Trim special characters, and replace '-' with '_' since '-' is used to

 * separate different DMI fields in the card long name. Only number and

 * alphabet characters and a few separator characters are kept.
@@ -2049,6 +2050,7 @@ int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour) 
	return 0;

}

EXPORT_SYMBOL_GPL(snd_soc_set_dmi_name);

#endif /* CONFIG_DMI */



static int snd_soc_instantiate_card(struct snd_soc_card *card)

{