aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2015-08-02 11:20:02 -0400
committerMark Brown <broonie@kernel.org>2015-08-05 08:24:09 -0400
commit5d272d89339a4f8c1905d5bdf5851346582b78f2 (patch)
tree2e608534531976d2f2e44fe24c59cbc1bc3fb7d2 /sound
parent11c3727c4e625c248ff3b546290aade1399affec (diff)
ASoC: wm8961: 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>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm8961.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8961.c b/sound/soc/codecs/wm8961.c
index a057662632ff..44ee1431e295 100644
--- a/sound/soc/codecs/wm8961.c
+++ b/sound/soc/codecs/wm8961.c
@@ -331,13 +331,12 @@ static const DECLARE_TLV_DB_SCALE(out_tlv, -12100, 100, 1);
331static const DECLARE_TLV_DB_SCALE(hp_sec_tlv, -700, 100, 0); 331static const DECLARE_TLV_DB_SCALE(hp_sec_tlv, -700, 100, 0);
332static const DECLARE_TLV_DB_SCALE(adc_tlv, -7200, 75, 1); 332static const DECLARE_TLV_DB_SCALE(adc_tlv, -7200, 75, 1);
333static const DECLARE_TLV_DB_SCALE(sidetone_tlv, -3600, 300, 0); 333static const DECLARE_TLV_DB_SCALE(sidetone_tlv, -3600, 300, 0);
334static unsigned int boost_tlv[] = { 334static const DECLARE_TLV_DB_RANGE(boost_tlv,
335 TLV_DB_RANGE_HEAD(4),
336 0, 0, TLV_DB_SCALE_ITEM(0, 0, 0), 335 0, 0, TLV_DB_SCALE_ITEM(0, 0, 0),
337 1, 1, TLV_DB_SCALE_ITEM(13, 0, 0), 336 1, 1, TLV_DB_SCALE_ITEM(13, 0, 0),
338 2, 2, TLV_DB_SCALE_ITEM(20, 0, 0), 337 2, 2, TLV_DB_SCALE_ITEM(20, 0, 0),
339 3, 3, TLV_DB_SCALE_ITEM(29, 0, 0), 338 3, 3, TLV_DB_SCALE_ITEM(29, 0, 0)
340}; 339);
341static const DECLARE_TLV_DB_SCALE(pga_tlv, -2325, 75, 0); 340static const DECLARE_TLV_DB_SCALE(pga_tlv, -2325, 75, 0);
342 341
343static const struct snd_kcontrol_new wm8961_snd_controls[] = { 342static const struct snd_kcontrol_new wm8961_snd_controls[] = {