Skip to content

Commit 165b34d

Browse files
committed
ASoC: Intel: bxt_pcm512x: fix compilation issues
Kbuild report errors when modules are enabled. Move structure definitions and use IS_ENABLED. Fixes: 7ce1ad6 ('ASoC: Intel: bxt_pcm512x: make HDMI optional') Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
1 parent 9b81e16 commit 165b34d

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

sound/soc/intel/boards/bxt_pcm512x.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,11 @@
3232
#include "../../codecs/pcm512x.h"
3333
#include "../atom/sst-atom-controls.h"
3434

35-
#ifdef CONFIG_SND_SOC_HDAC_HDMI
35+
struct bxt_card_private {
36+
struct list_head hdmi_pcm_list;
37+
};
38+
39+
#if IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)
3640
static struct snd_soc_jack broxton_hdmi[3];
3741

3842
struct bxt_hdmi_pcm {
@@ -99,10 +103,6 @@ static int bxt_card_late_probe(struct snd_soc_card *card)
99103
}
100104
#endif
101105

102-
struct bxt_card_private {
103-
struct list_head hdmi_pcm_list;
104-
};
105-
106106
static const struct snd_soc_dapm_widget dapm_widgets[] = {
107107
SND_SOC_DAPM_SPK("Ext Spk", NULL),
108108
};
@@ -192,7 +192,7 @@ static struct snd_soc_dai_link dailink[] = {
192192
.dpcm_playback = 1,
193193
.dpcm_capture = 1,
194194
},
195-
#ifdef CONFIG_SND_SOC_HDAC_HDMI
195+
#if IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)
196196
{
197197
.name = "iDisp1",
198198
.id = 1,

0 commit comments

Comments
 (0)