[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20190510132940.28184-1-yuehaibing@huawei.com>
Date: Fri, 10 May 2019 21:29:40 +0800
From: YueHaibing <yuehaibing@...wei.com>
To: <lgirdwood@...il.com>, <broonie@...nel.org>, <perex@...ex.cz>,
<tiwai@...e.com>, <pierre-louis.bossart@...ux.intel.com>,
<rdunlap@...radead.org>
CC: <linux-kernel@...r.kernel.org>, <alsa-devel@...a-project.org>,
YueHaibing <yuehaibing@...wei.com>
Subject: [PATCH V2] ASoC: SOF: Fix build error with CONFIG_SND_SOC_SOF_NOCODEC=m
Fix gcc build error while CONFIG_SND_SOC_SOF_NOCODEC=m
sound/soc/sof/core.o: In function `snd_sof_device_probe':
core.c:(.text+0x4af): undefined reference to `sof_nocodec_setup'
Change IS_ENABLED to IS_REACHABLE to fix this.
Reported-by: Hulk Robot <hulkci@...wei.com>
Suggested-by: Takashi Iwai <tiwai@...e.de>
Fixes: c16211d6226d ("ASoC: SOF: Add Sound Open Firmware driver core")
Signed-off-by: YueHaibing <yuehaibing@...wei.com>
---
V2: use IS_REACHABLE
---
sound/soc/sof/core.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c
index 32105e0..38e22f4 100644
--- a/sound/soc/sof/core.c
+++ b/sound/soc/sof/core.c
@@ -259,7 +259,7 @@ int snd_sof_create_page_table(struct snd_sof_dev *sdev,
static int sof_machine_check(struct snd_sof_dev *sdev)
{
struct snd_sof_pdata *plat_data = sdev->pdata;
-#if IS_ENABLED(CONFIG_SND_SOC_SOF_NOCODEC)
+#if IS_REACHABLE(CONFIG_SND_SOC_SOF_NOCODEC)
struct snd_soc_acpi_mach *machine;
int ret;
#endif
@@ -267,7 +267,7 @@ static int sof_machine_check(struct snd_sof_dev *sdev)
if (plat_data->machine)
return 0;
-#if !IS_ENABLED(CONFIG_SND_SOC_SOF_NOCODEC)
+#if !IS_REACHABLE(CONFIG_SND_SOC_SOF_NOCODEC)
dev_err(sdev->dev, "error: no matching ASoC machine driver found - aborting probe\n");
return -ENODEV;
#else
--
2.7.4
Powered by blists - more mailing lists