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

ASoC: wm8991: Don't use range container for TLVs with one entry 



For TLVs with only a single entry it is not necessary to use a range
container. Use DECLARE_TLV_DB_LINEAR() directly instead of a combination of
TLV_DB_RANGE_HEAD() and TLV_DB_LINEAR_ITEM().

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent dfd0edda

sound/soc/codecs/wm8991.c

+9 −43
Original line number Diff line number Diff line
@@ -111,45 +111,14 @@ static bool wm8991_volatile(struct device *dev, unsigned int reg) 
	}

}



static const unsigned int rec_mix_tlv[] = {

	TLV_DB_RANGE_HEAD(1),

	0, 7, TLV_DB_LINEAR_ITEM(-1500, 600),

};



static const unsigned int in_pga_tlv[] = {

	TLV_DB_RANGE_HEAD(1),

	0, 0x1F, TLV_DB_LINEAR_ITEM(-1650, 3000),

};



static const unsigned int out_mix_tlv[] = {

	TLV_DB_RANGE_HEAD(1),

	0, 7, TLV_DB_LINEAR_ITEM(0, -2100),

};



static const unsigned int out_pga_tlv[] = {

	TLV_DB_RANGE_HEAD(1),

	0, 127, TLV_DB_LINEAR_ITEM(-7300, 600),

};



static const unsigned int out_omix_tlv[] = {

	TLV_DB_RANGE_HEAD(1),

	0, 7, TLV_DB_LINEAR_ITEM(-600, 0),

};



static const unsigned int out_dac_tlv[] = {

	TLV_DB_RANGE_HEAD(1),

	0, 255, TLV_DB_LINEAR_ITEM(-7163, 0),

};



static const unsigned int in_adc_tlv[] = {

	TLV_DB_RANGE_HEAD(1),

	0, 255, TLV_DB_LINEAR_ITEM(-7163, 1763),

};



static const unsigned int out_sidetone_tlv[] = {

	TLV_DB_RANGE_HEAD(1),

	0, 31, TLV_DB_LINEAR_ITEM(-3600, 0),

};

static const DECLARE_TLV_DB_LINEAR(rec_mix_tlv, -1500, 600);

static const DECLARE_TLV_DB_LINEAR(in_pga_tlv, -1650, 3000);

static const DECLARE_TLV_DB_LINEAR(out_mix_tlv, 0, -2100);

static const DECLARE_TLV_DB_LINEAR(out_pga_tlv, -7300, 600);

static const DECLARE_TLV_DB_LINEAR(out_omix_tlv, -600, 0);

static const DECLARE_TLV_DB_LINEAR(out_dac_tlv, -7163, 0);

static const DECLARE_TLV_DB_LINEAR(in_adc_tlv, -7163, 1763);

static const DECLARE_TLV_DB_LINEAR(out_sidetone_tlv, -3600, 0);



static int wm899x_outpga_put_volsw_vu(struct snd_kcontrol *kcontrol,

				      struct snd_ctl_elem_value *ucontrol)
@@ -429,10 +398,7 @@ static int outmixer_event(struct snd_soc_dapm_widget *w, 
}



/* INMIX dB values */

static const unsigned int in_mix_tlv[] = {

	TLV_DB_RANGE_HEAD(1),

	0, 7, TLV_DB_LINEAR_ITEM(-1200, 600),

};

static const DECLARE_TLV_DB_LINEAR(in_mix_tlv, -1200, 600);



/* Left In PGA Connections */

static const struct snd_kcontrol_new wm8991_dapm_lin12_pga_controls[] = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE