]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
ASoC: SOF: Fix unused variable warnings
authorTakashi Iwai <tiwai@suse.de>
Wed, 8 May 2019 08:50:37 +0000 (10:50 +0200)
committerMark Brown <broonie@kernel.org>
Thu, 9 May 2019 02:18:57 +0000 (11:18 +0900)
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>
sound/soc/sof/core.c

index 5ddbfa8f1a2871912c16d6184a77cf814ee63596..32105e0fabe884f368e1ae943f844a5141bb029b 100644 (file)
@@ -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;