ASoC: rt5514: Use the IS_ENABLED to supports the module build
Subsystems (3)
Oder Chiou
maintainerPATCH 1/1 ASoC: rt5514: Use the IS_ENABLED to supports the module build
The patch uses the macro IS_ENABLED to make sure that the SPI function also supports the module build.
--- sound/soc/codecs/rt5514.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/soc/codecs/rt5514.c +3 -3
@@ -31,7 +31,7 @@#include "rl6231.h" #include "rt5514.h" -#if defined(CONFIG_SND_SOC_RT5514_SPI ) +#if IS_ENABLED (CONFIG_SND_SOC_RT5514_SPI )#include "rt5514-spi.h" #endif
@@ -312,7 +312,7 @@ static int rt5514_dsp_voice_wake_up_put(struct snd_kcontrol *kcontrol,request_firmware (&fw,RT5514_FIRMWARE1 , codec->dev);if (fw) { -#if defined(CONFIG_SND_SOC_RT5514_SPI ) +#if IS_ENABLED (CONFIG_SND_SOC_RT5514_SPI )rt5514_spi_burst_write (0x4ff60000 , fw->data, ((fw->size/8 )+1 )*8 );#else
@@ -325,7 +325,7 @@ static int rt5514_dsp_voice_wake_up_put(struct snd_kcontrol *kcontrol,request_firmware (&fw,RT5514_FIRMWARE2 , codec->dev);if (fw) { -#if defined(CONFIG_SND_SOC_RT5514_SPI ) +#if IS_ENABLED (CONFIG_SND_SOC_RT5514_SPI )rt5514_spi_burst_write (0x4ffc0000 , fw->data, ((fw->size/8 )+1 )*8 );#else
Signature · 1 line
2.7.4
Mark Brown
maintainerApplied "ASoC: rt5514: Use the IS_ENABLED to supports the module build" to the asoc tree
The patch
ASoC: rt5514: Use the IS_ENABLED to supports the module build
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
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
Quoted 1 line
From
c2bf252536577db77c719f62a54cad2e4be5c4d7Mon Sep 17 00:00:00 2001
From: "[email protected]" <[email protected]>
Date: Wed, 26 Jul 2017 18:32:20 +0800
Subject: [PATCH] ASoC: rt5514: Use the IS_ENABLED to supports the module build
The patch uses the macro IS_ENABLED to make sure that the SPI function also supports the module build.
--- sound/soc/codecs/rt5514.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/soc/codecs/rt5514.c +3 -3
@@ -31,7 +31,7 @@#include "rl6231.h" #include "rt5514.h" -#if defined(CONFIG_SND_SOC_RT5514_SPI ) +#if IS_ENABLED (CONFIG_SND_SOC_RT5514_SPI )#include "rt5514-spi.h" #endif
@@ -312,7 +312,7 @@ static int rt5514_dsp_voice_wake_up_put(struct snd_kcontrol *kcontrol,request_firmware (&fw,RT5514_FIRMWARE1 , codec->dev);if (fw) { -#if defined(CONFIG_SND_SOC_RT5514_SPI ) +#if IS_ENABLED (CONFIG_SND_SOC_RT5514_SPI )rt5514_spi_burst_write (0x4ff60000 , fw->data, ((fw->size/8 )+1 )*8 );#else
@@ -325,7 +325,7 @@ static int rt5514_dsp_voice_wake_up_put(struct snd_kcontrol *kcontrol,request_firmware (&fw,RT5514_FIRMWARE2 , codec->dev);if (fw) { -#if defined(CONFIG_SND_SOC_RT5514_SPI ) +#if IS_ENABLED (CONFIG_SND_SOC_RT5514_SPI )rt5514_spi_burst_write (0x4ffc0000 , fw->data, ((fw->size/8 )+1 )*8 );#else
Signature · 1 line
2.13.2