[PATCH 1/2] ASoC: Remove unused defines in alc5632 codec.

[PATCH 1/2] ASoC: Remove unused defines in alc5632 codec.

[Leon Romanovsky]

Signed-off-by: Leon Romanovsky <leon@leon.nu>
---
 sound/soc/codecs/alc5632.c |   21 ---------------------
 1 files changed, 0 insertions(+), 21 deletions(-)

diff --git a/sound/soc/codecs/alc5632.c b/sound/soc/codecs/alc5632.c
index 68465d8..0fff98e 100644
--- a/sound/soc/codecs/alc5632.c
+++ b/sound/soc/codecs/alc5632.c
@@ -964,27 +964,6 @@ static int alc5632_resume(struct snd_soc_codec *codec)
 	return 0;
 }
 
-#define ALC5632_REC_UNMUTE (ALC5632_ADC_REC_MIC2 \
-		| ALC5632_ADC_REC_LINE_IN | ALC5632_ADC_REC_AUX \
-		| ALC5632_ADC_REC_HP | ALC5632_ADC_REC_SPK \
-		| ALC5632_ADC_REC_MONOMIX)
-
-#define ALC5632_MIC_ROUTE (ALC5632_MIC_ROUTE_HP \
-		| ALC5632_MIC_ROUTE_SPK \
-		| ALC5632_MIC_ROUTE_MONOMIX)
-
-#define ALC5632_PWR_DEFAULT (ALC5632_PWR_ADC_STATUS \
-		| ALC5632_PWR_DAC_STATUS \
-		| ALC5632_PWR_AMIX_STATUS \
-		| ALC5632_PWR_VREF_STATUS)
-
-#define ALC5632_ADC_REC_GAIN_COMP(x) (int)((x - ALC5632_ADC_REC_GAIN_BASE) \
-		/ ALC5632_ADC_REC_GAIN_STEP)
-
-#define ALC5632_MIC_BOOST_COMP(x) (int)(x / ALC5632_MIC_BOOST_STEP)
-
-#define ALC5632_SPK_OUT_VOL_COMP(x) (int)(x / ALC5632_SPK_OUT_VOL_STEP)
-
 static int alc5632_probe(struct snd_soc_codec *codec)
 {
 	struct alc5632_priv *alc5632 = snd_soc_codec_get_drvdata(codec);
-- 
1.7.3.4

[PATCH 2/2] ASoC: Remove unnecessary backslash from alc5632 codec.

[Leon Romanovsky]

Signed-off-by: Leon Romanovsky <leon@leon.nu>
---
 sound/soc/codecs/alc5632.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sound/soc/codecs/alc5632.c b/sound/soc/codecs/alc5632.c
index 0fff98e..e6e63d24 100644
--- a/sound/soc/codecs/alc5632.c
+++ b/sound/soc/codecs/alc5632.c
@@ -811,7 +811,7 @@ static int alc5632_pcm_hw_params(struct snd_pcm_substream *substream,
 static int alc5632_mute(struct snd_soc_dai *dai, int mute)
 {
 	struct snd_soc_codec *codec = dai->codec;
-	u16 hp_mute = ALC5632_MISC_HP_DEPOP_MUTE_L \
+	u16 hp_mute = ALC5632_MISC_HP_DEPOP_MUTE_L
 						|ALC5632_MISC_HP_DEPOP_MUTE_R;
 	u16 mute_reg = snd_soc_read(codec, ALC5632_MISC_CTRL) & ~hp_mute;
 
-- 
1.7.3.4

Re: [PATCH 1/2] ASoC: Remove unused defines in alc5632 codec.

[Mark Brown]

On Thu, Nov 10, 2011 at 09:22:15PM +0200, Leon Romanovsky wrote:
> Signed-off-by: Leon Romanovsky <leon@leon.nu>

Applied both, thanks.