diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2015-08-02 11:20:09 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-08-05 08:24:38 -0400 |
commit | 5092e76b8ab406af56b6a24629a7daf30ea94f78 (patch) | |
tree | f8579592c3bca926cbabb31d0cf53298fcb646f9 | |
parent | 0894e2b3cddaf00a52302d0eb83edb717c6fb913 (diff) |
ASoC: wm9713: Replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE
DECLARE_TLV_DB_RANGE() has the advantage over using TLV_DB_RANGE_HEAD()
that it automatically calculates the number of items in the TLV and is
hence less prone to manual error.
Generate using the following coccinelle script
// <smpl>
@@
declarer name DECLARE_TLV_DB_RANGE;
identifier tlv;
constant x;
@@
-unsigned int tlv[] = {
- TLV_DB_RANGE_HEAD(x),
+DECLARE_TLV_DB_RANGE(tlv,
...
-};
+);
// </smpl>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | sound/soc/codecs/wm9713.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c index 89cd2d6f57c0..e842b08c3242 100644 --- a/sound/soc/codecs/wm9713.c +++ b/sound/soc/codecs/wm9713.c | |||
@@ -116,11 +116,10 @@ SOC_ENUM_SINGLE_VIRT(2, wm9713_micb_select), /* mic selection 19 */ | |||
116 | static const DECLARE_TLV_DB_SCALE(out_tlv, -4650, 150, 0); | 116 | static const DECLARE_TLV_DB_SCALE(out_tlv, -4650, 150, 0); |
117 | static const DECLARE_TLV_DB_SCALE(main_tlv, -3450, 150, 0); | 117 | static const DECLARE_TLV_DB_SCALE(main_tlv, -3450, 150, 0); |
118 | static const DECLARE_TLV_DB_SCALE(misc_tlv, -1500, 300, 0); | 118 | static const DECLARE_TLV_DB_SCALE(misc_tlv, -1500, 300, 0); |
119 | static unsigned int mic_tlv[] = { | 119 | static const DECLARE_TLV_DB_RANGE(mic_tlv, |
120 | TLV_DB_RANGE_HEAD(2), | ||
121 | 0, 2, TLV_DB_SCALE_ITEM(1200, 600, 0), | 120 | 0, 2, TLV_DB_SCALE_ITEM(1200, 600, 0), |
122 | 3, 3, TLV_DB_SCALE_ITEM(3000, 0, 0), | 121 | 3, 3, TLV_DB_SCALE_ITEM(3000, 0, 0) |
123 | }; | 122 | ); |
124 | 123 | ||
125 | static const struct snd_kcontrol_new wm9713_snd_ac97_controls[] = { | 124 | static const struct snd_kcontrol_new wm9713_snd_ac97_controls[] = { |
126 | SOC_DOUBLE_TLV("Speaker Playback Volume", AC97_MASTER, 8, 0, 31, 1, out_tlv), | 125 | SOC_DOUBLE_TLV("Speaker Playback Volume", AC97_MASTER, 8, 0, 31, 1, out_tlv), |