aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-02-18 04:26:27 -0500
committerMark Brown <broonie@linaro.org>2014-02-22 21:27:20 -0500
commit3cd7ca58827234c40bb683de2d1d8512631be8e4 (patch)
tree06feab13df6dd5ed558931e53238ba7026ed8edc
parent38dbfb59d1175ef458d006556061adeaa8751b72 (diff)
ASoC: stac9766: Use SOC_ENUM_{SINGLE|DOUBLE}_DECL()
Just replace with the helper macros. No functional change at all. Signed-off-by: Takashi Iwai <tiwai@suse.de> Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com> Acked-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--sound/soc/codecs/stac9766.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/sound/soc/codecs/stac9766.c b/sound/soc/codecs/stac9766.c
index a5455c1aea42..53b810d23fea 100644
--- a/sound/soc/codecs/stac9766.c
+++ b/sound/soc/codecs/stac9766.c
@@ -62,25 +62,25 @@ static const char *stac9766_boost1[] = {"0dB", "10dB"};
62static const char *stac9766_boost2[] = {"0dB", "20dB"}; 62static const char *stac9766_boost2[] = {"0dB", "20dB"};
63static const char *stac9766_stereo_mic[] = {"Off", "On"}; 63static const char *stac9766_stereo_mic[] = {"Off", "On"};
64 64
65static const struct soc_enum stac9766_record_enum = 65static SOC_ENUM_DOUBLE_DECL(stac9766_record_enum,
66 SOC_ENUM_DOUBLE(AC97_REC_SEL, 8, 0, 8, stac9766_record_mux); 66 AC97_REC_SEL, 8, 0, stac9766_record_mux);
67static const struct soc_enum stac9766_mono_enum = 67static SOC_ENUM_SINGLE_DECL(stac9766_mono_enum,
68 SOC_ENUM_SINGLE(AC97_GENERAL_PURPOSE, 9, 2, stac9766_mono_mux); 68 AC97_GENERAL_PURPOSE, 9, stac9766_mono_mux);
69static const struct soc_enum stac9766_mic_enum = 69static SOC_ENUM_SINGLE_DECL(stac9766_mic_enum,
70 SOC_ENUM_SINGLE(AC97_GENERAL_PURPOSE, 8, 2, stac9766_mic_mux); 70 AC97_GENERAL_PURPOSE, 8, stac9766_mic_mux);
71static const struct soc_enum stac9766_SPDIF_enum = 71static SOC_ENUM_SINGLE_DECL(stac9766_SPDIF_enum,
72 SOC_ENUM_SINGLE(AC97_STAC_DA_CONTROL, 1, 2, stac9766_SPDIF_mux); 72 AC97_STAC_DA_CONTROL, 1, stac9766_SPDIF_mux);
73static const struct soc_enum stac9766_popbypass_enum = 73static SOC_ENUM_SINGLE_DECL(stac9766_popbypass_enum,
74 SOC_ENUM_SINGLE(AC97_GENERAL_PURPOSE, 15, 2, stac9766_popbypass_mux); 74 AC97_GENERAL_PURPOSE, 15, stac9766_popbypass_mux);
75static const struct soc_enum stac9766_record_all_enum = 75static SOC_ENUM_SINGLE_DECL(stac9766_record_all_enum,
76 SOC_ENUM_SINGLE(AC97_STAC_ANALOG_SPECIAL, 12, 2, 76 AC97_STAC_ANALOG_SPECIAL, 12,
77 stac9766_record_all_mux); 77 stac9766_record_all_mux);
78static const struct soc_enum stac9766_boost1_enum = 78static SOC_ENUM_SINGLE_DECL(stac9766_boost1_enum,
79 SOC_ENUM_SINGLE(AC97_MIC, 6, 2, stac9766_boost1); /* 0/10dB */ 79 AC97_MIC, 6, stac9766_boost1); /* 0/10dB */
80static const struct soc_enum stac9766_boost2_enum = 80static SOC_ENUM_SINGLE_DECL(stac9766_boost2_enum,
81 SOC_ENUM_SINGLE(AC97_STAC_ANALOG_SPECIAL, 2, 2, stac9766_boost2); /* 0/20dB */ 81 AC97_STAC_ANALOG_SPECIAL, 2, stac9766_boost2); /* 0/20dB */
82static const struct soc_enum stac9766_stereo_mic_enum = 82static SOC_ENUM_SINGLE_DECL(stac9766_stereo_mic_enum,
83 SOC_ENUM_SINGLE(AC97_STAC_STEREO_MIC, 2, 1, stac9766_stereo_mic); 83 AC97_STAC_STEREO_MIC, 2, stac9766_stereo_mic);
84 84
85static const DECLARE_TLV_DB_LINEAR(master_tlv, -4600, 0); 85static const DECLARE_TLV_DB_LINEAR(master_tlv, -4600, 0);
86static const DECLARE_TLV_DB_LINEAR(record_tlv, 0, 2250); 86static const DECLARE_TLV_DB_LINEAR(record_tlv, 0, 2250);