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

ASoC: rt5631: 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
7f708abe d6e3bb7a

+3 -4
+3 -4
sound/soc/codecs/rt5631.c
··· 174 174 static const DECLARE_TLV_DB_SCALE(dac_vol_tlv, -95625, 375, 0); 175 175 static const DECLARE_TLV_DB_SCALE(in_vol_tlv, -3450, 150, 0); 176 176 /* {0, +20, +24, +30, +35, +40, +44, +50, +52}dB */ 177 - static unsigned int mic_bst_tlv[] = { 178 - TLV_DB_RANGE_HEAD(7), 177 + static const DECLARE_TLV_DB_RANGE(mic_bst_tlv, 179 178 0, 0, TLV_DB_SCALE_ITEM(0, 0, 0), 180 179 1, 1, TLV_DB_SCALE_ITEM(2000, 0, 0), 181 180 2, 2, TLV_DB_SCALE_ITEM(2400, 0, 0), 182 181 3, 5, TLV_DB_SCALE_ITEM(3000, 500, 0), 183 182 6, 6, TLV_DB_SCALE_ITEM(4400, 0, 0), 184 183 7, 7, TLV_DB_SCALE_ITEM(5000, 0, 0), 185 - 8, 8, TLV_DB_SCALE_ITEM(5200, 0, 0), 186 - }; 184 + 8, 8, TLV_DB_SCALE_ITEM(5200, 0, 0) 185 + ); 187 186 188 187 static int rt5631_dmic_get(struct snd_kcontrol *kcontrol, 189 188 struct snd_ctl_elem_value *ucontrol)