diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-02-18 04:26:27 -0500 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-02-22 21:27:20 -0500 |
commit | 3cd7ca58827234c40bb683de2d1d8512631be8e4 (patch) | |
tree | 06feab13df6dd5ed558931e53238ba7026ed8edc | |
parent | 38dbfb59d1175ef458d006556061adeaa8751b72 (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.c | 38 |
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"}; | |||
62 | static const char *stac9766_boost2[] = {"0dB", "20dB"}; | 62 | static const char *stac9766_boost2[] = {"0dB", "20dB"}; |
63 | static const char *stac9766_stereo_mic[] = {"Off", "On"}; | 63 | static const char *stac9766_stereo_mic[] = {"Off", "On"}; |
64 | 64 | ||
65 | static const struct soc_enum stac9766_record_enum = | 65 | static 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); |
67 | static const struct soc_enum stac9766_mono_enum = | 67 | static 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); |
69 | static const struct soc_enum stac9766_mic_enum = | 69 | static 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); |
71 | static const struct soc_enum stac9766_SPDIF_enum = | 71 | static 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); |
73 | static const struct soc_enum stac9766_popbypass_enum = | 73 | static 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); |
75 | static const struct soc_enum stac9766_record_all_enum = | 75 | static 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); |
78 | static const struct soc_enum stac9766_boost1_enum = | 78 | static 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 */ |
80 | static const struct soc_enum stac9766_boost2_enum = | 80 | static 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 */ |
82 | static const struct soc_enum stac9766_stereo_mic_enum = | 82 | static 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 | ||
85 | static const DECLARE_TLV_DB_LINEAR(master_tlv, -4600, 0); | 85 | static const DECLARE_TLV_DB_LINEAR(master_tlv, -4600, 0); |
86 | static const DECLARE_TLV_DB_LINEAR(record_tlv, 0, 2250); | 86 | static const DECLARE_TLV_DB_LINEAR(record_tlv, 0, 2250); |