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

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

ASoC: wm8960: 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>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 29b4817d

sound/soc/codecs/wm8960.c

+2 −3
Original line number Diff line number Diff line
@@ -226,11 +226,10 @@ static const DECLARE_TLV_DB_SCALE(dac_tlv, -12750, 50, 1); 
static const DECLARE_TLV_DB_SCALE(bypass_tlv, -2100, 300, 0);

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

static const DECLARE_TLV_DB_SCALE(lineinboost_tlv, -1500, 300, 1);

static const unsigned int micboost_tlv[] = {

	TLV_DB_RANGE_HEAD(2),

static const SNDRV_CTL_TLVD_DECLARE_DB_RANGE(micboost_tlv,

	0, 1, TLV_DB_SCALE_ITEM(0, 1300, 0),

	2, 3, TLV_DB_SCALE_ITEM(2000, 900, 0),

};

);



static const struct snd_kcontrol_new wm8960_snd_controls[] = {

SOC_DOUBLE_R_TLV("Capture Volume", WM8960_LINVOL, WM8960_RINVOL,