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/samsung/smdk_wm8994.c | |
| parent | 831ffa45e7465e45ab2244da6bbed6bead47b6bc (diff) | |
| download | op-kernel-dev-d77a14b579f6bfe2d149d3bcc5bd306e20d2d652.zip op-kernel-dev-d77a14b579f6bfe2d149d3bcc5bd306e20d2d652.tar.gz | |
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/samsung/smdk_wm8994.c')
| -rw-r--r-- | sound/soc/samsung/smdk_wm8994.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/sound/soc/samsung/smdk_wm8994.c b/sound/soc/samsung/smdk_wm8994.c index 682eb4f..fc25cc0 100644 --- a/sound/soc/samsung/smdk_wm8994.c +++ b/sound/soc/samsung/smdk_wm8994.c @@ -89,18 +89,6 @@ static int smdk_wm8994_init_paiftx(struct snd_soc_pcm_runtime *rtd) struct snd_soc_codec *codec = rtd->codec; struct snd_soc_dapm_context *dapm = &codec->dapm; - /* HeadPhone */ - snd_soc_dapm_enable_pin(dapm, "HPOUT1R"); - snd_soc_dapm_enable_pin(dapm, "HPOUT1L"); - - /* MicIn */ - snd_soc_dapm_enable_pin(dapm, "IN1LN"); - snd_soc_dapm_enable_pin(dapm, "IN1RN"); - - /* LineIn */ - snd_soc_dapm_enable_pin(dapm, "IN2LN"); - snd_soc_dapm_enable_pin(dapm, "IN2RN"); - /* Other pins NC */ snd_soc_dapm_nc_pin(dapm, "HPOUT2P"); snd_soc_dapm_nc_pin(dapm, "HPOUT2N"); |
