Commit 3e8e1952 authored by Ian Molton's avatar Ian Molton Committed by Mark Brown
Browse files

ASoC: cleanup duplicated code. 



Many codec drivers were implementing cookie-cutter copies of the function
that adds kcontrols to the codec.

This patch moves this code to a common function snd_soc_add_controls() in
soc-core.c and updates all drivers using copies of this function to use the
new common version.

[Edited to raise priority of error log message and document parameters.
 -- broonie]

Signed-off-by: default avatarIan Molton <ian@mnementh.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent a6ba2b2d

include/sound/soc.h

+2 −0
Original line number Diff line number Diff line
@@ -214,6 +214,8 @@ void snd_soc_free_ac97_codec(struct snd_soc_codec *codec); 
 */

struct snd_kcontrol *snd_soc_cnew(const struct snd_kcontrol_new *_template,

	void *data, char *long_name);

int snd_soc_add_controls(struct snd_soc_codec *codec,

	const struct snd_kcontrol_new *controls, int num_controls);

int snd_soc_info_enum_double(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_info *uinfo);

int snd_soc_info_enum_ext(struct snd_kcontrol *kcontrol,

sound/soc/codecs/ad1980.c

+2 −15
Original line number Diff line number Diff line
@@ -93,20 +93,6 @@ SOC_ENUM("Capture Source", ad1980_cap_src), 
SOC_SINGLE("Mic Boost Switch", AC97_MIC, 6, 1, 0),

};



/* add non dapm controls */

static int ad1980_add_controls(struct snd_soc_codec *codec)

{

	int err, i;



	for (i = 0; i < ARRAY_SIZE(ad1980_snd_ac97_controls); i++) {

		err = snd_ctl_add(codec->card, snd_soc_cnew(

				&ad1980_snd_ac97_controls[i], codec, NULL));

		if (err < 0)

			return err;

	}

	return 0;

}



static unsigned int ac97_read(struct snd_soc_codec *codec,

	unsigned int reg)

{
@@ -269,7 +255,8 @@ static int ad1980_soc_probe(struct platform_device *pdev) 
	ext_status = ac97_read(codec, AC97_EXTENDED_STATUS);

	ac97_write(codec, AC97_EXTENDED_STATUS, ext_status&~0x3800);



	ad1980_add_controls(codec);

	snd_soc_add_controls(codec, ad1980_snd_ac97_controls,

				ARRAY_SIZE(ad1980_snd_ac97_controls));

	ret = snd_soc_init_card(socdev);

	if (ret < 0) {

		printk(KERN_ERR "ad1980: failed to register card\n");

sound/soc/codecs/ak4535.c

+2 −16
Original line number Diff line number Diff line
@@ -155,21 +155,6 @@ static const struct snd_kcontrol_new ak4535_snd_controls[] = { 
	SOC_SINGLE("Mic Sidetone Volume", AK4535_VOL, 4, 7, 0),

};



/* add non dapm controls */

static int ak4535_add_controls(struct snd_soc_codec *codec)

{

	int err, i;



	for (i = 0; i < ARRAY_SIZE(ak4535_snd_controls); i++) {

		err = snd_ctl_add(codec->card,

			snd_soc_cnew(&ak4535_snd_controls[i], codec, NULL));

		if (err < 0)

			return err;

	}



	return 0;

}



/* Mono 1 Mixer */

static const struct snd_kcontrol_new ak4535_mono1_mixer_controls[] = {

	SOC_DAPM_SINGLE("Mic Sidetone Switch", AK4535_SIG1, 4, 1, 0),
@@ -510,7 +495,8 @@ static int ak4535_init(struct snd_soc_device *socdev) 
	/* power on device */

	ak4535_set_bias_level(codec, SND_SOC_BIAS_STANDBY);



	ak4535_add_controls(codec);

	snd_soc_add_controls(codec, ak4535_snd_controls,

				ARRAY_SIZE(ak4535_snd_controls));

	ak4535_add_widgets(codec);

	ret = snd_soc_init_card(socdev);

	if (ret < 0) {

sound/soc/codecs/ssm2602.c

+2 −16
Original line number Diff line number Diff line
@@ -151,21 +151,6 @@ SOC_ENUM("Capture Source", ssm2602_enum[0]), 
SOC_ENUM("Playback De-emphasis", ssm2602_enum[1]),

};



/* add non dapm controls */

static int ssm2602_add_controls(struct snd_soc_codec *codec)

{

	int err, i;



	for (i = 0; i < ARRAY_SIZE(ssm2602_snd_controls); i++) {

		err = snd_ctl_add(codec->card,

			snd_soc_cnew(&ssm2602_snd_controls[i], codec, NULL));

		if (err < 0)

			return err;

	}



	return 0;

}



/* Output Mixer */

static const struct snd_kcontrol_new ssm2602_output_mixer_controls[] = {

SOC_DAPM_SINGLE("Line Bypass Switch", SSM2602_APANA, 3, 1, 0),
@@ -622,7 +607,8 @@ static int ssm2602_init(struct snd_soc_device *socdev) 
			APANA_ENABLE_MIC_BOOST);

	ssm2602_write(codec, SSM2602_PWR, 0);



	ssm2602_add_controls(codec);

	snd_soc_add_controls(codec, ssm2602_snd_controls,

				ARRAY_SIZE(ssm2602_snd_controls));

	ssm2602_add_widgets(codec);

	ret = snd_soc_init_card(socdev);

	if (ret < 0) {

sound/soc/codecs/tlv320aic23.c

+2 −19
Original line number Diff line number Diff line
@@ -183,24 +183,6 @@ static const struct snd_kcontrol_new tlv320aic23_snd_controls[] = { 
	SOC_ENUM("Playback De-emphasis", tlv320aic23_deemph),

};



/* add non dapm controls */

static int tlv320aic23_add_controls(struct snd_soc_codec *codec)

{



	int err, i;



	for (i = 0; i < ARRAY_SIZE(tlv320aic23_snd_controls); i++) {

		err = snd_ctl_add(codec->card,

				  snd_soc_cnew(&tlv320aic23_snd_controls[i],

					       codec, NULL));

		if (err < 0)

			return err;

	}



	return 0;



}



/* PGA Mixer controls for Line and Mic switch */

static const struct snd_kcontrol_new tlv320aic23_output_mixer_controls[] = {

	SOC_DAPM_SINGLE("Line Bypass Switch", TLV320AIC23_ANLG, 3, 1, 0),
@@ -718,7 +700,8 @@ static int tlv320aic23_init(struct snd_soc_device *socdev) 


	tlv320aic23_write(codec, TLV320AIC23_ACTIVE, 0x1);



	tlv320aic23_add_controls(codec);

	snd_soc_add_controls(codec, tlv320aic23_snd_controls,

				ARRAY_SIZE(tlv320aic23_snd_controls));

	tlv320aic23_add_widgets(codec);

	ret = snd_soc_init_card(socdev);

	if (ret < 0) {