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

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

ASoC: wm8962: 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 5d272d89

sound/soc/codecs/wm8962.c

+6 −8
Original line number Diff line number Diff line
@@ -1456,14 +1456,13 @@ static int wm8962_reset(struct wm8962_priv *wm8962) 


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

static const DECLARE_TLV_DB_SCALE(mixin_tlv, -1500, 300, 0);

static const unsigned int mixinpga_tlv[] = {

	TLV_DB_RANGE_HEAD(5),

static const DECLARE_TLV_DB_RANGE(mixinpga_tlv,

	0, 1, TLV_DB_SCALE_ITEM(0, 600, 0),

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

	3, 4, TLV_DB_SCALE_ITEM(1800, 200, 0),

	5, 5, TLV_DB_SCALE_ITEM(2400, 0, 0),

	6, 7, TLV_DB_SCALE_ITEM(2700, 300, 0),

};

	6, 7, TLV_DB_SCALE_ITEM(2700, 300, 0)

);

static const DECLARE_TLV_DB_SCALE(beep_tlv, -9600, 600, 1);

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

static const DECLARE_TLV_DB_SCALE(st_tlv, -3600, 300, 0);
@@ -1471,11 +1470,10 @@ static const DECLARE_TLV_DB_SCALE(inmix_tlv, -600, 600, 0); 
static const DECLARE_TLV_DB_SCALE(bypass_tlv, -1500, 300, 0);

static const DECLARE_TLV_DB_SCALE(out_tlv, -12100, 100, 1);

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

static const unsigned int classd_tlv[] = {

	TLV_DB_RANGE_HEAD(2),

static const DECLARE_TLV_DB_RANGE(classd_tlv,

	0, 6, TLV_DB_SCALE_ITEM(0, 150, 0),

	7, 7, TLV_DB_SCALE_ITEM(1200, 0, 0),

};

	7, 7, TLV_DB_SCALE_ITEM(1200, 0, 0)

);

static const DECLARE_TLV_DB_SCALE(eq_tlv, -1200, 100, 0);



static int wm8962_dsp2_write_config(struct snd_soc_codec *codec)