diff options
| author |   Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2019-12-11 13:32:05 +0900 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2019-12-11 16:43:16 +0000 |
| commit | 8a6a6a38f86885982891197840e7b8eccad5ef50 (patch) | |
| tree | f4069e1bbeaa1c810bb16cd66046e0ea83aaace7 /include/sound/soc.h | |
| parent | ASoC: soc-core: merge soc_set_name_prefix() and soc_set_of_name_prefix() (diff) | |
| download | wireguard-linux-8a6a6a38f86885982891197840e7b8eccad5ef50.tar.xz wireguard-linux-8a6a6a38f86885982891197840e7b8eccad5ef50.zip | |
ASoC: soc-core: tidyup for CONFIG_DMI
soc-core.c has 2 #ifdef CONFIG_DMI, but we can merge these.
OTOH, soc.h has dmi_longname, but it is needed if CONFIG_DMI was defined.
In other words, It is not needed if CONFIG_DMI was not defined.
This patch tidyup these.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87eexbbhyy.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'include/sound/soc.h')
| -rw-r--r-- | include/sound/soc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index c920f17a5647..a6a3a7d54c70 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -986,7 +986,9 @@ struct snd_soc_card { const char *long_name; const char *driver_name; const char *components; +#ifdef CONFIG_DMI char dmi_longname[80]; +#endif /* CONFIG_DMI */ char topology_shortname[32]; struct device *dev; |