diff mbox series

ASoC: Intel: Skylake: Fix Kconfig dependency

Message ID 20221121104742.1007486-1-lili.li@intel.com
State New
Headers
Series ASoC: Intel: Skylake: Fix Kconfig dependency |

Commit Message

lili.li@intel.com Nov. 21, 2022, 10:47 a.m. UTC 
  From: Lili Li <lili.li@intel.com>

Commit e4746d94d00c ("ASoC: Intel: Skylake: Introduce HDA codec init and
exit routines") introduced HDA codec init routine which depends on SND_HDA.
Select SND_SOC_HDAC_HDA unconditionally to fix following compile error:
ERROR: modpost: "snd_hda_codec_device_init" [sound/soc/intel/skylake/snd-soc-skl.ko] undefined!

Fixes: e4746d94d00c ("ASoC: Intel: Skylake: Introduce HDA codec init and exit routines")
Reviewed-by: Junxiao Chang <junxiao.chang@intel.com>
Suggested-by: Cezary Rojewski <cezary.rojewski@intel.com>
Signed-off-by: Lili Li <lili.li@intel.com>
---
 sound/soc/intel/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Cezary Rojewski Nov. 21, 2022, 11:49 a.m. UTC | #1 
On 2022-11-21 11:47 AM, lili.li@intel.com wrote:
> From: Lili Li <lili.li@intel.com>
> 
> Commit e4746d94d00c ("ASoC: Intel: Skylake: Introduce HDA codec init and
> exit routines") introduced HDA codec init routine which depends on SND_HDA.
> Select SND_SOC_HDAC_HDA unconditionally to fix following compile error:
> ERROR: modpost: "snd_hda_codec_device_init" [sound/soc/intel/skylake/snd-soc-skl.ko] undefined!
> 
> Fixes: e4746d94d00c ("ASoC: Intel: Skylake: Introduce HDA codec init and exit routines")
> Reviewed-by: Junxiao Chang <junxiao.chang@intel.com>
> Suggested-by: Cezary Rojewski <cezary.rojewski@intel.com>
> Signed-off-by: Lili Li <lili.li@intel.com>
> ---
>   sound/soc/intel/Kconfig | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
> index d2ca710ac3fa..ac799de4f7fd 100644
> --- a/sound/soc/intel/Kconfig
> +++ b/sound/soc/intel/Kconfig
> @@ -177,7 +177,7 @@ config SND_SOC_INTEL_SKYLAKE_COMMON
>   	select SND_HDA_DSP_LOADER
>   	select SND_SOC_TOPOLOGY
>   	select SND_SOC_INTEL_SST
> -	select SND_SOC_HDAC_HDA if SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC
> +	select SND_SOC_HDAC_HDA
>   	select SND_SOC_ACPI_INTEL_MATCH
>   	select SND_INTEL_DSP_CONFIG
>   	help

Thanks once again your for report and input.

Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>
Mark Brown Nov. 22, 2022, 2:49 p.m. UTC | #2 
On Mon, 21 Nov 2022 18:47:42 +0800, lili.li@intel.com wrote:
> From: Lili Li <lili.li@intel.com>
> 
> Commit e4746d94d00c ("ASoC: Intel: Skylake: Introduce HDA codec init and
> exit routines") introduced HDA codec init routine which depends on SND_HDA.
> Select SND_SOC_HDAC_HDA unconditionally to fix following compile error:
> ERROR: modpost: "snd_hda_codec_device_init" [sound/soc/intel/skylake/snd-soc-skl.ko] undefined!
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: Intel: Skylake: Fix Kconfig dependency
      commit: e5d4d2b23aed20a7815d1b500dbcd50af1da0023

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark
diff mbox series

Patch

diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index d2ca710ac3fa..ac799de4f7fd 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -177,7 +177,7 @@  config SND_SOC_INTEL_SKYLAKE_COMMON
 	select SND_HDA_DSP_LOADER
 	select SND_SOC_TOPOLOGY
 	select SND_SOC_INTEL_SST
-	select SND_SOC_HDAC_HDA if SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC
+	select SND_SOC_HDAC_HDA
 	select SND_SOC_ACPI_INTEL_MATCH
 	select SND_INTEL_DSP_CONFIG
 	help