| Message ID | 20220706205515.2485601-1-Vijendar.Mukunda@amd.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ab34403db24233e603338b70deb9a84093c88397 |
| Headers | show |
| Series | ASoC: amd: fix ACPI dependency compile errors and warnings | expand |
On Thu, 7 Jul 2022 02:25:14 +0530, Vijendar Mukunda wrote: > Fixed ACPI dependency complie errors and warnings as listed below. > > All warnings (new ones prefixed by >>): > > sound/soc/soc-acpi.c:34:1: error: redefinition of 'snd_soc_acpi_find_machine' > 34 | snd_soc_acpi_find_machine(struct snd_soc_acpi_mach *machines) > | ^~~~~~~~~~~~~~~~~~~~~~~~~ > In file included from sound/soc/soc-acpi.c:9: > include/sound/soc-acpi.h:38:1: note: previous definition of > 'snd_soc_acpi_find_machine' > with type 'struct snd_soc_acpi_mach *(struct snd_soc_acpi_mach *)' > 38 | snd_soc_acpi_find_machine(struct snd_soc_acpi_mach *machines) > | ^~~~~~~~~~~~~~~~~~~~~~~~~ > sound/soc/soc-acpi.c: In function 'snd_soc_acpi_find_package': > sound/soc/soc-acpi.c:58:36: error: implicit declaration of function > 'acpi_fetch_acpi_dev'; > did you mean 'device_match_acpi_dev'? > [-Werror=implicit-function-declaration] > 58 | struct acpi_device *adev = acpi_fetch_acpi_dev(handle); > | ^~~~~~~~~~~~~~~~~~~ > | device_match_acpi_dev > >> sound/soc/soc-acpi.c:58:36: warning: initialization of > 'struct acpi_device *' from 'int' makes pointer from integer > without a cast [-Wint-conversion] > sound/soc/soc-acpi.c:64:25: error: invalid use of undefined type > 'struct acpi_device' > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: amd: fix ACPI dependency compile errors and warnings commit: ab34403db24233e603338b70deb9a84093c88397 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 --git a/sound/soc/amd/Kconfig b/sound/soc/amd/Kconfig index c373f0823462..9629328c419e 100644 --- a/sound/soc/amd/Kconfig +++ b/sound/soc/amd/Kconfig @@ -25,10 +25,9 @@ config SND_SOC_AMD_CZ_RT5645_MACH config SND_SOC_AMD_ST_ES8336_MACH tristate "AMD ST support for ES8336" - select SND_SOC_ACPI + select SND_SOC_ACPI if ACPI select SND_SOC_ES8316 - depends on SND_SOC_AMD_ACP - depends on ACPI || COMPILE_TEST + depends on SND_SOC_AMD_ACP && ACPI depends on I2C || COMPILE_TEST help This option enables machine driver for Jadeite platform
Fixed ACPI dependency complie errors and warnings as listed below. All warnings (new ones prefixed by >>): sound/soc/soc-acpi.c:34:1: error: redefinition of 'snd_soc_acpi_find_machine' 34 | snd_soc_acpi_find_machine(struct snd_soc_acpi_mach *machines) | ^~~~~~~~~~~~~~~~~~~~~~~~~ In file included from sound/soc/soc-acpi.c:9: include/sound/soc-acpi.h:38:1: note: previous definition of 'snd_soc_acpi_find_machine' with type 'struct snd_soc_acpi_mach *(struct snd_soc_acpi_mach *)' 38 | snd_soc_acpi_find_machine(struct snd_soc_acpi_mach *machines) | ^~~~~~~~~~~~~~~~~~~~~~~~~ sound/soc/soc-acpi.c: In function 'snd_soc_acpi_find_package': sound/soc/soc-acpi.c:58:36: error: implicit declaration of function 'acpi_fetch_acpi_dev'; did you mean 'device_match_acpi_dev'? [-Werror=implicit-function-declaration] 58 | struct acpi_device *adev = acpi_fetch_acpi_dev(handle); | ^~~~~~~~~~~~~~~~~~~ | device_match_acpi_dev >> sound/soc/soc-acpi.c:58:36: warning: initialization of 'struct acpi_device *' from 'int' makes pointer from integer without a cast [-Wint-conversion] sound/soc/soc-acpi.c:64:25: error: invalid use of undefined type 'struct acpi_device' 64 | if (adev && adev->status.present && adev->status.functional) { | ^~ sound/soc/soc-acpi.c:64:49: error: invalid use of undefined type 'struct acpi_device' 64 | if (adev && adev->status.present && adev->status.functional) { | ^~ sound/soc/soc-acpi.c:80:26: error: implicit declaration of function 'acpi_extract_package' [-Werror=implicit-function-declaration] 80 | status = acpi_extract_package(myobj, | ^~~~~~~~~~~~~~~~~~~~ sound/soc/soc-acpi.c: At top level: sound/soc/soc-acpi.c:95:6: error: redefinition of 'snd_soc_acpi_find_package_from_hid' 95 | bool snd_soc_acpi_find_package_from_hid(const u8 hid[ACPI_ID_LEN], | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from sound/soc/soc-acpi.c:9: include/sound/soc-acpi.h:44:1: note: previous definition of 'snd_soc_acpi_find_package_from_hid' with type 'bool(const u8 *, struct snd_soc_acpi_package_context *)' {aka '_Bool(const unsigned char *, struct snd_soc_acpi_package_context *)'} 44 | snd_soc_acpi_find_package_from_hid(const u8 hid[ACPI_ID_LEN], | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ sound/soc/soc-acpi.c:109:27: error: redefinition of 'snd_soc_acpi_codec_list' 109 | struct snd_soc_acpi_mach *snd_soc_acpi_codec_list(void *arg) | ^~~~~~~~~~~~~~~~~~~~~~~ In file included from sound/soc/soc-acpi.c:9: include/sound/soc-acpi.h:51:41: note: previous definition of 'snd_soc_acpi_codec_list' with type 'struct snd_soc_acpi_mach *(void *)' 51 | static inline struct snd_soc_acpi_mach *snd_soc_acpi_codec_list(void *arg) | ^~~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com> Reported-by: kernel test robot <lkp@intel.com> --- sound/soc/amd/Kconfig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)