Commit 53eb1ca3 authored Aug 02, 2015 by Lars-Peter Clausen Committed by Mark Brown Aug 05, 2015

ASoC: sgtl5000: 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>

parent 53f28609

sound/soc/codecs/sgtl5000.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -406,11 +406,10 @@ static int dac_put_volsw(struct snd_kcontrol *kcontrol,
		static const DECLARE_TLV_DB_SCALE(capture_6db_attenuate, -600, 600, 0);

		/* tlv for mic gain, 0db 20db 30db 40db */
		static const unsigned int mic_gain_tlv[] = {
		TLV_DB_RANGE_HEAD(2),
		static const DECLARE_TLV_DB_RANGE(mic_gain_tlv,
		0, 0, TLV_DB_SCALE_ITEM(0, 0, 0),
		1, 3, TLV_DB_SCALE_ITEM(2000, 1000, 0),
		};
		1, 3, TLV_DB_SCALE_ITEM(2000, 1000, 0)
		);

		/* tlv for hp volume, -51.5db to 12.0db, step .5db */
		static const DECLARE_TLV_DB_SCALE(headphone_volume, -5150, 50, 0);