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

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

ASoC: wm9713: 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 0894e2b3

sound/soc/codecs/wm9713.c

+3 −4
Original line number Diff line number Diff line
@@ -116,11 +116,10 @@ SOC_ENUM_SINGLE_VIRT(2, wm9713_micb_select), /* mic selection 19 */ 
static const DECLARE_TLV_DB_SCALE(out_tlv, -4650, 150, 0);

static const DECLARE_TLV_DB_SCALE(main_tlv, -3450, 150, 0);

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

static unsigned int mic_tlv[] = {

	TLV_DB_RANGE_HEAD(2),

static const  DECLARE_TLV_DB_RANGE(mic_tlv,

	0, 2, TLV_DB_SCALE_ITEM(1200, 600, 0),

	3, 3, TLV_DB_SCALE_ITEM(3000, 0, 0),

};

	3, 3, TLV_DB_SCALE_ITEM(3000, 0, 0)

);



static const struct snd_kcontrol_new wm9713_snd_ac97_controls[] = {

SOC_DOUBLE_TLV("Speaker Playback Volume", AC97_MASTER, 8, 0, 31, 1, out_tlv),