Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f17cbcfe authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

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: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent bc0195aa

sound/soc/codecs/88pm860x-codec.c

+12 −16
Original line number Original line Diff line number Diff line
@@ -156,33 +156,29 @@ static const DECLARE_TLV_DB_SCALE(dpga_tlv, -9450, 150, 1); 
static const DECLARE_TLV_DB_SCALE(adc_tlv, -900, 300, 0);

static const DECLARE_TLV_DB_SCALE(adc_tlv, -900, 300, 0);





/* {-23, -17, -13.5, -11, -9, -6, -3, 0}dB */

/* {-23, -17, -13.5, -11, -9, -6, -3, 0}dB */

static const unsigned int mic_tlv[] = {

static const DECLARE_TLV_DB_RANGE(mic_tlv,

	TLV_DB_RANGE_HEAD(5),

	0, 0, TLV_DB_SCALE_ITEM(-2300, 0, 0),

	0, 0, TLV_DB_SCALE_ITEM(-2300, 0, 0),

	1, 1, TLV_DB_SCALE_ITEM(-1700, 0, 0),

	1, 1, TLV_DB_SCALE_ITEM(-1700, 0, 0),

	2, 2, TLV_DB_SCALE_ITEM(-1350, 0, 0),

	2, 2, TLV_DB_SCALE_ITEM(-1350, 0, 0),

	3, 3, TLV_DB_SCALE_ITEM(-1100, 0, 0),

	3, 3, TLV_DB_SCALE_ITEM(-1100, 0, 0),

	4, 7, TLV_DB_SCALE_ITEM(-900, 300, 0),

	4, 7, TLV_DB_SCALE_ITEM(-900, 300, 0)

};

);





/* {0, 0, 0, -6, 0, 6, 12, 18}dB */

/* {0, 0, 0, -6, 0, 6, 12, 18}dB */

static const unsigned int aux_tlv[] = {

static const DECLARE_TLV_DB_RANGE(aux_tlv,

	TLV_DB_RANGE_HEAD(2),

	0, 2, TLV_DB_SCALE_ITEM(0, 0, 0),

	0, 2, TLV_DB_SCALE_ITEM(0, 0, 0),

	3, 7, TLV_DB_SCALE_ITEM(-600, 600, 0),

	3, 7, TLV_DB_SCALE_ITEM(-600, 600, 0)

};

);





/* {-16, -13, -10, -7, -5.2, -3,3, -2.2, 0}dB, mute instead of -16dB */

/* {-16, -13, -10, -7, -5.2, -3,3, -2.2, 0}dB, mute instead of -16dB */

static const unsigned int out_tlv[] = {

static const DECLARE_TLV_DB_RANGE(out_tlv,

	TLV_DB_RANGE_HEAD(4),

	0, 3, TLV_DB_SCALE_ITEM(-1600, 300, 1),

	0, 3, TLV_DB_SCALE_ITEM(-1600, 300, 1),

	4, 4, TLV_DB_SCALE_ITEM(-520, 0, 0),

	4, 4, TLV_DB_SCALE_ITEM(-520, 0, 0),

	5, 5, TLV_DB_SCALE_ITEM(-330, 0, 0),

	5, 5, TLV_DB_SCALE_ITEM(-330, 0, 0),

	6, 7, TLV_DB_SCALE_ITEM(-220, 220, 0),

	6, 7, TLV_DB_SCALE_ITEM(-220, 220, 0)

};

);





static const unsigned int st_tlv[] = {

static const DECLARE_TLV_DB_RANGE(st_tlv,

	TLV_DB_RANGE_HEAD(8),

	0, 1, TLV_DB_SCALE_ITEM(-12041, 602, 0),

	0, 1, TLV_DB_SCALE_ITEM(-12041, 602, 0),

	2, 3, TLV_DB_SCALE_ITEM(-11087, 250, 0),

	2, 3, TLV_DB_SCALE_ITEM(-11087, 250, 0),

	4, 5, TLV_DB_SCALE_ITEM(-10643, 158, 0),

	4, 5, TLV_DB_SCALE_ITEM(-10643, 158, 0),
@@ -190,8 +186,8 @@ static const unsigned int st_tlv[] = { 
	8, 9, TLV_DB_SCALE_ITEM(-10133, 92, 0),

	8, 9, TLV_DB_SCALE_ITEM(-10133, 92, 0),

	10, 13, TLV_DB_SCALE_ITEM(-9958, 70, 0),

	10, 13, TLV_DB_SCALE_ITEM(-9958, 70, 0),

	14, 17, TLV_DB_SCALE_ITEM(-9689, 53, 0),

	14, 17, TLV_DB_SCALE_ITEM(-9689, 53, 0),

	18, 271, TLV_DB_SCALE_ITEM(-9484, 37, 0),

	18, 271, TLV_DB_SCALE_ITEM(-9484, 37, 0)

};

);





/* Sidetone Gain = M * 2^(-5-N) */

/* Sidetone Gain = M * 2^(-5-N) */

struct st_gain {

struct st_gain {