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

ASoC: 88pm860x: 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
f17cbcfe bc0195aa

+12 -16
+12 -16
sound/soc/codecs/88pm860x-codec.c
··· 156 156 static const DECLARE_TLV_DB_SCALE(adc_tlv, -900, 300, 0); 157 157 158 158 /* {-23, -17, -13.5, -11, -9, -6, -3, 0}dB */ 159 - static const unsigned int mic_tlv[] = { 160 - TLV_DB_RANGE_HEAD(5), 159 + static const DECLARE_TLV_DB_RANGE(mic_tlv, 161 160 0, 0, TLV_DB_SCALE_ITEM(-2300, 0, 0), 162 161 1, 1, TLV_DB_SCALE_ITEM(-1700, 0, 0), 163 162 2, 2, TLV_DB_SCALE_ITEM(-1350, 0, 0), 164 163 3, 3, TLV_DB_SCALE_ITEM(-1100, 0, 0), 165 - 4, 7, TLV_DB_SCALE_ITEM(-900, 300, 0), 166 - }; 164 + 4, 7, TLV_DB_SCALE_ITEM(-900, 300, 0) 165 + ); 167 166 168 167 /* {0, 0, 0, -6, 0, 6, 12, 18}dB */ 169 - static const unsigned int aux_tlv[] = { 170 - TLV_DB_RANGE_HEAD(2), 168 + static const DECLARE_TLV_DB_RANGE(aux_tlv, 171 169 0, 2, TLV_DB_SCALE_ITEM(0, 0, 0), 172 - 3, 7, TLV_DB_SCALE_ITEM(-600, 600, 0), 173 - }; 170 + 3, 7, TLV_DB_SCALE_ITEM(-600, 600, 0) 171 + ); 174 172 175 173 /* {-16, -13, -10, -7, -5.2, -3,3, -2.2, 0}dB, mute instead of -16dB */ 176 - static const unsigned int out_tlv[] = { 177 - TLV_DB_RANGE_HEAD(4), 174 + static const DECLARE_TLV_DB_RANGE(out_tlv, 178 175 0, 3, TLV_DB_SCALE_ITEM(-1600, 300, 1), 179 176 4, 4, TLV_DB_SCALE_ITEM(-520, 0, 0), 180 177 5, 5, TLV_DB_SCALE_ITEM(-330, 0, 0), 181 - 6, 7, TLV_DB_SCALE_ITEM(-220, 220, 0), 182 - }; 178 + 6, 7, TLV_DB_SCALE_ITEM(-220, 220, 0) 179 + ); 183 180 184 - static const unsigned int st_tlv[] = { 185 - TLV_DB_RANGE_HEAD(8), 181 + static const DECLARE_TLV_DB_RANGE(st_tlv, 186 182 0, 1, TLV_DB_SCALE_ITEM(-12041, 602, 0), 187 183 2, 3, TLV_DB_SCALE_ITEM(-11087, 250, 0), 188 184 4, 5, TLV_DB_SCALE_ITEM(-10643, 158, 0), ··· 186 190 8, 9, TLV_DB_SCALE_ITEM(-10133, 92, 0), 187 191 10, 13, TLV_DB_SCALE_ITEM(-9958, 70, 0), 188 192 14, 17, TLV_DB_SCALE_ITEM(-9689, 53, 0), 189 - 18, 271, TLV_DB_SCALE_ITEM(-9484, 37, 0), 190 - }; 193 + 18, 271, TLV_DB_SCALE_ITEM(-9484, 37, 0) 194 + ); 191 195 192 196 /* Sidetone Gain = M * 2^(-5-N) */ 193 197 struct st_gain {