diff mbox series

ASoC: SOF: Intel: move CODEC_PROBE_RETRIES definition

Message ID 20211204174529.1122697-1-arnd@kernel.org (mailing list archive)
State New, archived
Headers show
Series ASoC: SOF: Intel: move CODEC_PROBE_RETRIES definition | expand

Commit Message

Arnd Bergmann Dec. 4, 2021, 5:44 p.m. UTC 
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(-)

Comments

Hui Wang Dec. 6, 2021, 12:36 a.m. UTC | #1 
Thanks Arnd, and Kai Vehmanen already sent a fix for this building 
failure: 
https://mailman.alsa-project.org/pipermail/alsa-devel/2021-December/193313.html

On 12/5/21 1:44 AM, Arnd Bergmann wrote:
> 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)
diff mbox series

Patch

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)