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/kirkwood | |
| parent | 831ffa45e7465e45ab2244da6bbed6bead47b6bc (diff) | |
| download | linux-stable-d77a14b579f6bfe2d149d3bcc5bd306e20d2d652.tar.gz linux-stable-d77a14b579f6bfe2d149d3bcc5bd306e20d2d652.tar.bz2 linux-stable-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/kirkwood')
| -rw-r--r-- | sound/soc/kirkwood/kirkwood-t5325.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/sound/soc/kirkwood/kirkwood-t5325.c b/sound/soc/kirkwood/kirkwood-t5325.c index d213832b0c72..844b8415a011 100644 --- a/sound/soc/kirkwood/kirkwood-t5325.c +++ b/sound/soc/kirkwood/kirkwood-t5325.c @@ -52,18 +52,6 @@ static const struct snd_soc_dapm_route t5325_route[] = { { "MIC2", NULL, "Mic Jack" }, }; -static int t5325_dai_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, "Mic Jack"); - snd_soc_dapm_enable_pin(dapm, "Headphone Jack"); - snd_soc_dapm_enable_pin(dapm, "Speaker"); - - return 0; -} - static struct snd_soc_dai_link t5325_dai[] = { { .name = "ALC5621", @@ -74,7 +62,6 @@ static struct snd_soc_dai_link t5325_dai[] = { .codec_name = "alc562x-codec.0-001a", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS, .ops = &t5325_ops, - .init = t5325_dai_init, }, }; |