diff mbox series

[-next] ASoC: amd: fix Jadeite kconfig warning and build errors

Message ID 20220712183348.31046-1-rdunlap@infradead.org (mailing list archive)
State Accepted
Commit 1795c16a436057f95fef5b622d808885dd772d0e
Headers show
Series [-next] ASoC: amd: fix Jadeite kconfig warning and build errors | expand

Commit Message

Randy Dunlap July 12, 2022, 6:33 p.m. UTC
Since SND_SOC_ES8316 has a hard dependency on I2C and since 'select'
does not follow any dependency chains, SND_SOC_AMD_ST_ES8336_MACH
also needs to have a hard dependency on I2C.

Fixes a kconfig warning and subsequent build errors:

WARNING: unmet direct dependencies detected for SND_SOC_ES8316
  Depends on [n]: SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && I2C [=n]
  Selected by [y]:
  - SND_SOC_AMD_ST_ES8336_MACH [=y] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_SOC_AMD_ACP [=y] && ACPI [=y] && (I2C [=n] || COMPILE_TEST [=y])

sound/soc/codecs/es8316.c:866:1: warning: data definition has no type or storage class
  866 | module_i2c_driver(es8316_i2c_driver);
sound/soc/codecs/es8316.c:866:1: error: type defaults to ‘int’ in declaration of ‘module_i2c_driver’ [-Werror=implicit-int]
sound/soc/codecs/es8316.c:866:1: warning: parameter names (without types) in function declaration
sound/soc/codecs/es8316.c:857:26: warning: ‘es8316_i2c_driver’ defined but not used [-Wunused-variable]
  857 | static struct i2c_driver es8316_i2c_driver = {

Fixes: f94fa8405801 ("ASoC: amd: enable machine driver build for Jadeite platform")
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: alsa-devel@alsa-project.org
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.com>
---
 sound/soc/amd/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Mark Brown July 13, 2022, 2:30 p.m. UTC | #1
On Tue, 12 Jul 2022 11:33:48 -0700, Randy Dunlap wrote:
> Since SND_SOC_ES8316 has a hard dependency on I2C and since 'select'
> does not follow any dependency chains, SND_SOC_AMD_ST_ES8336_MACH
> also needs to have a hard dependency on I2C.
> 
> Fixes a kconfig warning and subsequent build errors:
> 
> WARNING: unmet direct dependencies detected for SND_SOC_ES8316
>   Depends on [n]: SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && I2C [=n]
>   Selected by [y]:
>   - SND_SOC_AMD_ST_ES8336_MACH [=y] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_SOC_AMD_ACP [=y] && ACPI [=y] && (I2C [=n] || COMPILE_TEST [=y])
> 
> [...]

Applied to

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

Thanks!

[1/1] ASoC: amd: fix Jadeite kconfig warning and build errors
      commit: 1795c16a436057f95fef5b622d808885dd772d0e

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

--- a/sound/soc/amd/Kconfig
+++ b/sound/soc/amd/Kconfig
@@ -28,7 +28,7 @@  config SND_SOC_AMD_ST_ES8336_MACH
 	select SND_SOC_ACPI if ACPI
 	select SND_SOC_ES8316
 	depends on SND_SOC_AMD_ACP && ACPI
-	depends on I2C || COMPILE_TEST
+	depends on I2C
 	help
 	 This option enables machine driver for Jadeite platform
 	 using es8336 codec.