diff options
| author |   Jarkko Nikula <jarkko.nikula@linux.intel.com> | 2014-05-19 16:17:27 +0300 |
|---|---|---|
| committer |   Mark Brown <broonie@linaro.org> | 2014-05-19 17:19:18 +0100 |
| commit | d77a14b579f6bfe2d149d3bcc5bd306e20d2d652 (patch) | |
| tree | 5e40d7fa7a209b113a5ce0a27677e7f91ce8809b /sound/soc/atmel/snd-soc-afeb9260.c | |
| parent | ASoC: Remove needless snd_soc_dapm_sync() from machine driver inits (diff) | |
| download | linux-dev-d77a14b579f6bfe2d149d3bcc5bd306e20d2d652.tar.xz linux-dev-d77a14b579f6bfe2d149d3bcc5bd306e20d2d652.zip | |
ASoC: Remove needless snd_soc_dapm_enable_pin() from machine driver inits
ALSA SoC core marks widgets as connected by default when they are
initialized in snd_soc_dapm_new_control() so there is no need to call
snd_soc_dapm_enable_pin() from machine driver init functions.
Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/atmel/snd-soc-afeb9260.c')
| -rw-r--r-- | sound/soc/atmel/snd-soc-afeb9260.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/sound/soc/atmel/snd-soc-afeb9260.c b/sound/soc/atmel/snd-soc-afeb9260.c index f65f08beac31..9579799ace54 100644 --- a/sound/soc/atmel/snd-soc-afeb9260.c +++ b/sound/soc/atmel/snd-soc-afeb9260.c @@ -80,17 +80,6 @@ static const struct snd_soc_dapm_route afeb9260_audio_map[] = { {"MICIN", NULL, "Mic Jack"}, }; -static int afeb9260_tlv320aic23_init(struct snd_soc_pcm_runtime *rtd) -{ - struct snd_soc_codec *codec = rtd->codec; - struct snd_soc_dapm_context *dapm = &codec->dapm; - - snd_soc_dapm_enable_pin(dapm, "Headphone Jack"); - snd_soc_dapm_enable_pin(dapm, "Line In"); - snd_soc_dapm_enable_pin(dapm, "Mic Jack"); - - return 0; -} /* Digital audio interface glue - connects codec <--> CPU */ static struct snd_soc_dai_link afeb9260_dai = { @@ -100,7 +89,6 @@ static struct snd_soc_dai_link afeb9260_dai = { .codec_dai_name = "tlv320aic23-hifi", .platform_name = "atmel_pcm-audio", .codec_name = "tlv320aic23-codec.0-001a", - .init = afeb9260_tlv320aic23_init, .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_IF | SND_SOC_DAIFMT_CBM_CFM, .ops = &afeb9260_ops, |