summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-05-08 10:50:37 +0200
committerMark Brown <broonie@kernel.org>2019-05-09 11:18:57 +0900
commit7f6647ced298d56027218e47619b7f0d925fc83e (patch)
treef417ff5e93b0106fd277c6508f7095b4175e166c /sound
parent4fc19fffaaf87335aafaeb059a561ef91aa6031c (diff)
downloadlinux-stable-7f6647ced298d56027218e47619b7f0d925fc83e.tar.gz
linux-stable-7f6647ced298d56027218e47619b7f0d925fc83e.tar.bz2
linux-stable-7f6647ced298d56027218e47619b7f0d925fc83e.zip
ASoC: SOF: Fix unused variable warnings
The recent fix for the build fix caused a couple of unused variable compiler warnings when CONFIG_SND_SOC_SOF_NOCODEC isn't set: sound/soc/sof/core.c:263:6: warning: unused variable ‘ret’ [-Wunused-variable] sound/soc/sof/core.c:262:28: warning: unused variable ‘machine’ [-Wunused-variable] Fix them by adding another ifdef. Fixes: ce38a75089f7 ("ASoC: SOF: core: fix undefined nocodec reference") Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/sof/core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c
index 5ddbfa8f1a28..32105e0fabe8 100644
--- a/sound/soc/sof/core.c
+++ b/sound/soc/sof/core.c
@@ -259,8 +259,10 @@ 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)
struct snd_soc_acpi_mach *machine;
int ret;
+#endif
if (plat_data->machine)
return 0;