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

Commit 51a57640 authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Mark Brown
Browse files

ASoC: rt5616: remove usage of obsoleted TLV-related macro 



TLV_DB_RANGE_HEAD macro was obsoleted by commit bf1d1c9b ("ALSA: tlv:
add DECLARE_TLV_DB_RANGE()").

This commit removes usage of the macro, with the obsoleting macro renamed
to SNDRV_CTL_TLVD_DECLARE_DB_RANGE().

Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent b74e7a26

sound/soc/codecs/rt5616.c

+2 −3
Original line number Diff line number Diff line
@@ -294,8 +294,7 @@ static const DECLARE_TLV_DB_SCALE(adc_vol_tlv, -17625, 375, 0); 
static const DECLARE_TLV_DB_SCALE(adc_bst_tlv, 0, 1200, 0);



/* {0, +20, +24, +30, +35, +40, +44, +50, +52} dB */

static unsigned int bst_tlv[] = {

	TLV_DB_RANGE_HEAD(7),

static const SNDRV_CTL_TLVD_DECLARE_DB_RANGE(bst_tlv,

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

	1, 1, TLV_DB_SCALE_ITEM(2000, 0, 0),

	2, 2, TLV_DB_SCALE_ITEM(2400, 0, 0),
@@ -303,7 +302,7 @@ static unsigned int bst_tlv[] = { 
	6, 6, TLV_DB_SCALE_ITEM(4400, 0, 0),

	7, 7, TLV_DB_SCALE_ITEM(5000, 0, 0),

	8, 8, TLV_DB_SCALE_ITEM(5200, 0, 0),

};

);



static const struct snd_kcontrol_new rt5616_snd_controls[] = {

	/* Headphone Output Volume */