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

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

ASoC: wm8961: 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 11c3727c

sound/soc/codecs/wm8961.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -331,13 +331,12 @@ static const DECLARE_TLV_DB_SCALE(out_tlv, -12100, 100, 1); 
static const DECLARE_TLV_DB_SCALE(hp_sec_tlv, -700, 100, 0);

static const DECLARE_TLV_DB_SCALE(hp_sec_tlv, -700, 100, 0);

static const DECLARE_TLV_DB_SCALE(adc_tlv, -7200, 75, 1);

static const DECLARE_TLV_DB_SCALE(adc_tlv, -7200, 75, 1);

static const DECLARE_TLV_DB_SCALE(sidetone_tlv, -3600, 300, 0);

static const DECLARE_TLV_DB_SCALE(sidetone_tlv, -3600, 300, 0);

static unsigned int boost_tlv[] = {

static const DECLARE_TLV_DB_RANGE(boost_tlv,

	TLV_DB_RANGE_HEAD(4),

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

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

	1, 1, TLV_DB_SCALE_ITEM(13, 0, 0),

	1, 1, TLV_DB_SCALE_ITEM(13, 0, 0),

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

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

	3, 3, TLV_DB_SCALE_ITEM(29, 0, 0),

	3, 3, TLV_DB_SCALE_ITEM(29, 0, 0)

};

);

static const DECLARE_TLV_DB_SCALE(pga_tlv, -2325, 75, 0);

static const DECLARE_TLV_DB_SCALE(pga_tlv, -2325, 75, 0);





static const struct snd_kcontrol_new wm8961_snd_controls[] = {

static const struct snd_kcontrol_new wm8961_snd_controls[] = {