[PATCH] ASoC: amd: Add ACPI dependency to fix build error

[PATCH] ASoC: amd: Add ACPI dependency to fix build error

[Yu-Chun Lin]

As reported by the kernel test robot, the following error occurs:

   sound/soc/amd/yc/acp6x-mach.c: In function 'acp6x_probe':
>> sound/soc/amd/yc/acp6x-mach.c:573:15: error: implicit declaration of function 'acpi_evaluate_integer'; did you mean 'acpi_evaluate_object'? [-Werror=implicit-function-declaration]
     573 |         ret = acpi_evaluate_integer(handle, "_WOV", NULL, &dmic_status);
         |               ^~~~~~~~~~~~~~~~~~~~~
         |               acpi_evaluate_object
   cc1: some warnings being treated as errors

The function 'acpi_evaluate_integer' and its prototype in 'acpi_bus.h'
are only available when 'CONFIG_ACPI' is enabled. Add a 'depends on ACPI'
directive in Kconfig to ensure proper compilation.

Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202501090345.pBIDRTym-lkp@intel.com/
Signed-off-by: Yu-Chun Lin <eleanor15x@gmail.com>
---
 sound/soc/amd/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/amd/Kconfig b/sound/soc/amd/Kconfig
index c7590d4989bb..803521178279 100644
--- a/sound/soc/amd/Kconfig
+++ b/sound/soc/amd/Kconfig
@@ -105,7 +105,7 @@ config SND_SOC_AMD_ACP6x
 config SND_SOC_AMD_YC_MACH
 	tristate "AMD YC support for DMIC"
 	select SND_SOC_DMIC
-	depends on SND_SOC_AMD_ACP6x
+	depends on SND_SOC_AMD_ACP6x && ACPI
 	help
 	  This option enables machine driver for Yellow Carp platform
 	  using dmic. ACP IP has PDM Decoder block with DMA controller.
-- 
2.43.0

Re: [PATCH] ASoC: amd: Add ACPI dependency to fix build error

[Mario Limonciello]

On 1/9/2025 11:15, Yu-Chun Lin wrote:
> As reported by the kernel test robot, the following error occurs:
> 
>     sound/soc/amd/yc/acp6x-mach.c: In function 'acp6x_probe':
>>> sound/soc/amd/yc/acp6x-mach.c:573:15: error: implicit declaration of function 'acpi_evaluate_integer'; did you mean 'acpi_evaluate_object'? [-Werror=implicit-function-declaration]
>       573 |         ret = acpi_evaluate_integer(handle, "_WOV", NULL, &dmic_status);
>           |               ^~~~~~~~~~~~~~~~~~~~~
>           |               acpi_evaluate_object
>     cc1: some warnings being treated as errors
> 
> The function 'acpi_evaluate_integer' and its prototype in 'acpi_bus.h'
> are only available when 'CONFIG_ACPI' is enabled. Add a 'depends on ACPI'
> directive in Kconfig to ensure proper compilation.
> 
> Reported-by: kernel test robot <lkp@intel.com>
> Closes: https://lore.kernel.org/oe-kbuild-all/202501090345.pBIDRTym-lkp@intel.com/
> Signed-off-by: Yu-Chun Lin <eleanor15x@gmail.com>
Thanks for the fix!

Fixes: 4095cf872084 (ASoC: amd: yc: Fix for enabling DMIC on acp6x via 
_DSD entry)
Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>

I was also worried about commit 88438444fdddd ("ASoC: amd: ps: Fix for 
enabling DMIC on acp63 platform via _DSD entry"), but this was set 
correctly originally in commit 1e4366489e2c0 ("ASoC: amd: enable Pink 
Sardine acp6.2 drivers build").

> ---
>   sound/soc/amd/Kconfig | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/sound/soc/amd/Kconfig b/sound/soc/amd/Kconfig
> index c7590d4989bb..803521178279 100644
> --- a/sound/soc/amd/Kconfig
> +++ b/sound/soc/amd/Kconfig
> @@ -105,7 +105,7 @@ config SND_SOC_AMD_ACP6x
>   config SND_SOC_AMD_YC_MACH
>   	tristate "AMD YC support for DMIC"
>   	select SND_SOC_DMIC
> -	depends on SND_SOC_AMD_ACP6x
> +	depends on SND_SOC_AMD_ACP6x && ACPI
>   	help
>   	  This option enables machine driver for Yellow Carp platform
>   	  using dmic. ACP IP has PDM Decoder block with DMA controller.

Re: [PATCH] ASoC: amd: Add ACPI dependency to fix build error

[Mark Brown]

On Fri, 10 Jan 2025 01:15:47 +0800, Yu-Chun Lin wrote:
> As reported by the kernel test robot, the following error occurs:
> 
>    sound/soc/amd/yc/acp6x-mach.c: In function 'acp6x_probe':
> >> sound/soc/amd/yc/acp6x-mach.c:573:15: error: implicit declaration of function 'acpi_evaluate_integer'; did you mean 'acpi_evaluate_object'? [-Werror=implicit-function-declaration]
>      573 |         ret = acpi_evaluate_integer(handle, "_WOV", NULL, &dmic_status);
>          |               ^~~~~~~~~~~~~~~~~~~~~
>          |               acpi_evaluate_object
>    cc1: some warnings being treated as errors
> 
> [...]

Applied to

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

Thanks!

[1/1] ASoC: amd: Add ACPI dependency to fix build error
      commit: 7e24ec93aecd12e33d31e38e5af4625553bbc727

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