diff options
author | Jarkko Nikula <jarkko.nikula@linux.intel.com> | 2014-05-19 09:17:27 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-05-19 12:19:18 -0400 |
commit | d77a14b579f6bfe2d149d3bcc5bd306e20d2d652 (patch) | |
tree | 5e40d7fa7a209b113a5ce0a27677e7f91ce8809b /sound/soc/atmel | |
parent | 831ffa45e7465e45ab2244da6bbed6bead47b6bc (diff) |
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')
-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[] = { | |||
80 | {"MICIN", NULL, "Mic Jack"}, | 80 | {"MICIN", NULL, "Mic Jack"}, |
81 | }; | 81 | }; |
82 | 82 | ||
83 | static int afeb9260_tlv320aic23_init(struct snd_soc_pcm_runtime *rtd) | ||
84 | { | ||
85 | struct snd_soc_codec *codec = rtd->codec; | ||
86 | struct snd_soc_dapm_context *dapm = &codec->dapm; | ||
87 | |||
88 | snd_soc_dapm_enable_pin(dapm, "Headphone Jack"); | ||
89 | snd_soc_dapm_enable_pin(dapm, "Line In"); | ||
90 | snd_soc_dapm_enable_pin(dapm, "Mic Jack"); | ||
91 | |||
92 | return 0; | ||
93 | } | ||
94 | 83 | ||
95 | /* Digital audio interface glue - connects codec <--> CPU */ | 84 | /* Digital audio interface glue - connects codec <--> CPU */ |
96 | static struct snd_soc_dai_link afeb9260_dai = { | 85 | static struct snd_soc_dai_link afeb9260_dai = { |
@@ -100,7 +89,6 @@ static struct snd_soc_dai_link afeb9260_dai = { | |||
100 | .codec_dai_name = "tlv320aic23-hifi", | 89 | .codec_dai_name = "tlv320aic23-hifi", |
101 | .platform_name = "atmel_pcm-audio", | 90 | .platform_name = "atmel_pcm-audio", |
102 | .codec_name = "tlv320aic23-codec.0-001a", | 91 | .codec_name = "tlv320aic23-codec.0-001a", |
103 | .init = afeb9260_tlv320aic23_init, | ||
104 | .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_IF | | 92 | .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_IF | |
105 | SND_SOC_DAIFMT_CBM_CFM, | 93 | SND_SOC_DAIFMT_CBM_CFM, |
106 | .ops = &afeb9260_ops, | 94 | .ops = &afeb9260_ops, |