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

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

ASoC: da7210: 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>
Acked-by: default avatarAdam Thomson <Adam.Thomson.Opensource@diasemi.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0c812915

sound/soc/codecs/da7210.c

+9 −13
Original line number Diff line number Diff line
@@ -267,33 +267,29 @@ enum clk_src { 
 *

 * Reserved area are considered as "mute".

 */

static const unsigned int hp_out_tlv[] = {

	TLV_DB_RANGE_HEAD(2),

static const DECLARE_TLV_DB_RANGE(hp_out_tlv,

	0x0, 0x10, TLV_DB_SCALE_ITEM(TLV_DB_GAIN_MUTE, 0, 1),

	/* -54 dB to +15 dB */

	0x11, 0x3f, TLV_DB_SCALE_ITEM(-5400, 150, 0),

};

	0x11, 0x3f, TLV_DB_SCALE_ITEM(-5400, 150, 0)

);



static const unsigned int lineout_vol_tlv[] = {

	TLV_DB_RANGE_HEAD(2),

static const DECLARE_TLV_DB_RANGE(lineout_vol_tlv,

	0x0, 0x10, TLV_DB_SCALE_ITEM(TLV_DB_GAIN_MUTE, 0, 1),

	/* -54dB to 15dB */

	0x11, 0x3f, TLV_DB_SCALE_ITEM(-5400, 150, 0)

};

);



static const unsigned int mono_vol_tlv[] = {

	TLV_DB_RANGE_HEAD(2),

static const DECLARE_TLV_DB_RANGE(mono_vol_tlv,

	0x0, 0x2, TLV_DB_SCALE_ITEM(-1800, 0, 1),

	/* -18dB to 6dB */

	0x3, 0x7, TLV_DB_SCALE_ITEM(-1800, 600, 0)

};

);



static const unsigned int aux1_vol_tlv[] = {

	TLV_DB_RANGE_HEAD(2),

static const DECLARE_TLV_DB_RANGE(aux1_vol_tlv,

	0x0, 0x10, TLV_DB_SCALE_ITEM(TLV_DB_GAIN_MUTE, 0, 1),

	/* -48dB to 21dB */

	0x11, 0x3f, TLV_DB_SCALE_ITEM(-4800, 150, 0)

};

);



static const DECLARE_TLV_DB_SCALE(eq_gain_tlv, -1050, 150, 0);

static const DECLARE_TLV_DB_SCALE(adc_eq_master_gain_tlv, -1800, 600, 1);