On Fri, 2017-04-21 at 17:55 +0200, Takashi Iwai wrote:
> For systems without DMI, it makes no sense to have the code.
>
> Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
> ---
Both :-
Acked-by: Liam Girdwood <liam.r.girdwood@xxxxxxxxxxxxxxx>
> include/sound/soc.h | 8 ++++++++
> sound/soc/soc-core.c | 2 ++
> 2 files changed, 10 insertions(+)
>
> diff --git a/include/sound/soc.h b/include/sound/soc.h
> index cdfb55f7aede..915c06cb2b32 100644
> --- a/include/sound/soc.h
> +++ b/include/sound/soc.h
> @@ -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);
> diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
> index 2722bb0c5573..aac73ff8a92a 100644
> --- a/sound/soc/soc-core.c
> +++ b/sound/soc/soc-core.c
> @@ -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)
> {
_______________________________________________
Alsa-devel mailing list
Alsa-devel@xxxxxxxxxxxxxxxx
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
