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

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

ASoC: alc5623: 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 31581f3c

sound/soc/codecs/alc5623.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -82,12 +82,11 @@ static int amp_mixer_event(struct snd_soc_dapm_widget *w, 
static const DECLARE_TLV_DB_SCALE(vol_tlv, -3450, 150, 0);

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

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

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

static const DECLARE_TLV_DB_SCALE(adc_rec_tlv, -1650, 150, 0);

static const DECLARE_TLV_DB_SCALE(adc_rec_tlv, -1650, 150, 0);

static const unsigned int boost_tlv[] = {

static const DECLARE_TLV_DB_RANGE(boost_tlv,

	TLV_DB_RANGE_HEAD(3),

	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(3000, 0, 0),

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

};

);

static const DECLARE_TLV_DB_SCALE(dig_tlv, 0, 600, 0);

static const DECLARE_TLV_DB_SCALE(dig_tlv, 0, 600, 0);





static const struct snd_kcontrol_new alc5621_vol_snd_controls[] = {

static const struct snd_kcontrol_new alc5621_vol_snd_controls[] = {