diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2015-01-01 11:30:35 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-06 17:24:25 +0000 |
| commit | 057a1573fd1309a6b3a039f9cd75b4e90f7f6cf4 (patch) | |
| tree | 5fc9ac1981816c8d47f51c1fbfa4a07e0ef92793 /sound/soc/intel | |
| parent | 4e3461d34f4cd632b403342ea1df33135e5e3ad3 (diff) | |
| download | blackbird-op-linux-057a1573fd1309a6b3a039f9cd75b4e90f7f6cf4.tar.gz blackbird-op-linux-057a1573fd1309a6b3a039f9cd75b4e90f7f6cf4.zip | |
ASoC: broadwell: Drop unnecessary snd_soc_dapm_enable() calls
DAPM widgets are enabled by default, there is no need to enable them unless
they have previously been explicitly disabled.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel')
| -rw-r--r-- | sound/soc/intel/broadwell.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/sound/soc/intel/broadwell.c b/sound/soc/intel/broadwell.c index 7cf95d5d5d80..9cf7d01479ad 100644 --- a/sound/soc/intel/broadwell.c +++ b/sound/soc/intel/broadwell.c @@ -140,8 +140,6 @@ static struct snd_soc_ops broadwell_rt286_ops = { static int broadwell_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 *broadwell = pdata->dsp; int ret; @@ -155,14 +153,6 @@ static int broadwell_rtd_init(struct snd_soc_pcm_runtime *rtd) return ret; } - /* always connected - check HP for jack detect */ - snd_soc_dapm_enable_pin(dapm, "Headphone Jack"); - snd_soc_dapm_enable_pin(dapm, "Speaker"); - snd_soc_dapm_enable_pin(dapm, "Mic Jack"); - snd_soc_dapm_enable_pin(dapm, "Line Jack"); - snd_soc_dapm_enable_pin(dapm, "DMIC1"); - snd_soc_dapm_enable_pin(dapm, "DMIC2"); - return 0; } |
