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

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

ASoC: rt5677: 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 dea6d32e

sound/soc/codecs/rt5677.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -789,16 +789,15 @@ static const DECLARE_TLV_DB_SCALE(adc_bst_tlv, 0, 1200, 0); 
static const DECLARE_TLV_DB_SCALE(st_vol_tlv, -4650, 150, 0);

static const DECLARE_TLV_DB_SCALE(st_vol_tlv, -4650, 150, 0);





/* {0, +20, +24, +30, +35, +40, +44, +50, +52} dB */

/* {0, +20, +24, +30, +35, +40, +44, +50, +52} dB */

static unsigned int bst_tlv[] = {

static const DECLARE_TLV_DB_RANGE(bst_tlv,

	TLV_DB_RANGE_HEAD(7),

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

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

	1, 1, TLV_DB_SCALE_ITEM(2000, 0, 0),

	1, 1, TLV_DB_SCALE_ITEM(2000, 0, 0),

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

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

	3, 5, TLV_DB_SCALE_ITEM(3000, 500, 0),

	3, 5, TLV_DB_SCALE_ITEM(3000, 500, 0),

	6, 6, TLV_DB_SCALE_ITEM(4400, 0, 0),

	6, 6, TLV_DB_SCALE_ITEM(4400, 0, 0),

	7, 7, TLV_DB_SCALE_ITEM(5000, 0, 0),

	7, 7, TLV_DB_SCALE_ITEM(5000, 0, 0),

	8, 8, TLV_DB_SCALE_ITEM(5200, 0, 0),

	8, 8, TLV_DB_SCALE_ITEM(5200, 0, 0)

};

);





static int rt5677_dsp_vad_get(struct snd_kcontrol *kcontrol,

static int rt5677_dsp_vad_get(struct snd_kcontrol *kcontrol,

		struct snd_ctl_elem_value *ucontrol)

		struct snd_ctl_elem_value *ucontrol)