iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: Use data based init for sn95031 DAPM

Browse Source 
Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Lu Guanqun
2011-03-30 21:53:17 +08:00
committed by Mark Brown
parent b63c963da2
commit e27808df97
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sound/soc/codecs/sn95031.c
View File

@@ -825,8 +825,6 @@ EXPORT_SYMBOL_GPL(sn95031_jack_detection);
/* codec registration */ /* codec registration */
static int sn95031_codec_probe(struct snd_soc_codec *codec) static int sn95031_codec_probe(struct snd_soc_codec *codec)
{ {
int ret;
pr_debug("codec_probe called\n"); pr_debug("codec_probe called\n");
codec->dapm.bias_level = SND_SOC_BIAS_OFF; codec->dapm.bias_level = SND_SOC_BIAS_OFF;
@@ -877,16 +875,7 @@ static int sn95031_codec_probe(struct snd_soc_codec *codec)
snd_soc_add_controls(codec, sn95031_snd_controls, snd_soc_add_controls(codec, sn95031_snd_controls,
ARRAY_SIZE(sn95031_snd_controls)); ARRAY_SIZE(sn95031_snd_controls));
ret = snd_soc_dapm_new_controls(&codec->dapm, sn95031_dapm_widgets, return 0;
ARRAY_SIZE(sn95031_dapm_widgets));
if (ret)
pr_err("soc_dapm_new_control failed %d", ret);
ret = snd_soc_dapm_add_routes(&codec->dapm, sn95031_audio_map,
ARRAY_SIZE(sn95031_audio_map));
if (ret)
pr_err("soc_dapm_add_routes failed %d", ret);
return ret;
} }
static int sn95031_codec_remove(struct snd_soc_codec *codec) static int sn95031_codec_remove(struct snd_soc_codec *codec)
@@ -903,6 +892,10 @@ struct snd_soc_codec_driver sn95031_codec = {
.read = sn95031_read, .read = sn95031_read,
.write = sn95031_write, .write = sn95031_write,
.set_bias_level = sn95031_set_vaud_bias, .set_bias_level = sn95031_set_vaud_bias,
.dapm_widgets = sn95031_dapm_widgets,
.num_dapm_widgets = ARRAY_SIZE(sn95031_dapm_widgets),
.dapm_routes = sn95031_audio_map,
.num_dapm_routes = ARRAY_SIZE(sn95031_audio_map),
}; };
static int __devinit sn95031_device_probe(struct platform_device *pdev) static int __devinit sn95031_device_probe(struct platform_device *pdev)