diff options
| author | Jarkko Nikula | 2014-05-19 15:17:27 +0200 |
|---|---|---|
| committer | Mark Brown | 2014-05-19 18:19:18 +0200 |
| commit | d77a14b579f6bfe2d149d3bcc5bd306e20d2d652 (patch) | |
| tree | 5e40d7fa7a209b113a5ce0a27677e7f91ce8809b /sound/soc/intel/haswell.c | |
| parent | ASoC: Remove needless snd_soc_dapm_sync() from machine driver inits (diff) | |
| download | kernel-qcow2-linux-d77a14b579f6bfe2d149d3bcc5bd306e20d2d652.tar.gz kernel-qcow2-linux-d77a14b579f6bfe2d149d3bcc5bd306e20d2d652.tar.xz kernel-qcow2-linux-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/intel/haswell.c')
| -rw-r--r-- | sound/soc/intel/haswell.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sound/soc/intel/haswell.c b/sound/soc/intel/haswell.c index 54345a2a7386..94c2c33ffe49 100644 --- a/sound/soc/intel/haswell.c +++ b/sound/soc/intel/haswell.c @@ -89,8 +89,6 @@ static struct snd_soc_ops haswell_rt5640_ops = { static int haswell_rtd_init(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_codec *codec = rtd->codec; - struct snd_soc_dapm_context *dapm = &codec->dapm; struct sst_pdata *pdata = dev_get_platdata(rtd->platform->dev); struct sst_hsw *haswell = pdata->dsp; int ret; @@ -104,10 +102,6 @@ static int haswell_rtd_init(struct snd_soc_pcm_runtime *rtd) return ret; } - /* always connected */ - snd_soc_dapm_enable_pin(dapm, "Headphones"); - snd_soc_dapm_enable_pin(dapm, "Mic"); - return 0; } |