lkml.org 
[lkml]   [2021]   [Dec]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] ASoC: SOF: Intel: move CODEC_PROBE_RETRIES definition
Date
From: Arnd Bergmann <arnd@arndb.de>

The macro is defined in an #ifdef but used outside:

sound/soc/sof/intel/hda-codec.c: In function 'hda_codec_probe':
sound/soc/sof/intel/hda-codec.c:132:42: error: 'CODEC_PROBE_RETRIES' undeclared (first use in this function)
132 | } while (resp == -1 && retry++ < CODEC_PROBE_RETRIES);
| ^~~~~~~~~~~~~~~~~~~

Move it to a place where it can be seen unconditionally.

Fixes: 046aede2f847 ("ASoC: SOF: Intel: Retry codec probing if it fails")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
sound/soc/sof/intel/hda-codec.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sound/soc/sof/intel/hda-codec.c b/sound/soc/sof/intel/hda-codec.c
index 13cd96e6724a..4324178b3ca6 100644
--- a/sound/soc/sof/intel/hda-codec.c
+++ b/sound/soc/sof/intel/hda-codec.c
@@ -20,9 +20,10 @@
#include "../../codecs/hdac_hda.h"
#endif /* CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC */

+#define CODEC_PROBE_RETRIES 3
+
#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC)
#define IDISP_VID_INTEL 0x80860000
-#define CODEC_PROBE_RETRIES 3

/* load the legacy HDA codec driver */
static int request_codec_module(struct hda_codec *codec)
--
2.29.2
\
 
 \ /
  Last update: 2021-12-04 18:47    [W:0.037 / U:0.424 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site