Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Lars-Peter Clausen and committed by
Mark Brown
5d272d89 11c3727c

+3 -4
+3 -4
sound/soc/codecs/wm8961.c
··· 331 331 static const DECLARE_TLV_DB_SCALE(hp_sec_tlv, -700, 100, 0); 332 332 static const DECLARE_TLV_DB_SCALE(adc_tlv, -7200, 75, 1); 333 333 static const DECLARE_TLV_DB_SCALE(sidetone_tlv, -3600, 300, 0); 334 - static unsigned int boost_tlv[] = { 335 - TLV_DB_RANGE_HEAD(4), 334 + static const DECLARE_TLV_DB_RANGE(boost_tlv, 336 335 0, 0, TLV_DB_SCALE_ITEM(0, 0, 0), 337 336 1, 1, TLV_DB_SCALE_ITEM(13, 0, 0), 338 337 2, 2, TLV_DB_SCALE_ITEM(20, 0, 0), 339 - 3, 3, TLV_DB_SCALE_ITEM(29, 0, 0), 340 - }; 338 + 3, 3, TLV_DB_SCALE_ITEM(29, 0, 0) 339 + ); 341 340 static const DECLARE_TLV_DB_SCALE(pga_tlv, -2325, 75, 0); 342 341 343 342 static const struct snd_kcontrol_new wm8961_snd_controls[] = {