diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2015-01-01 05:30:35 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-01-06 12:24:25 -0500 |
commit | 057a1573fd1309a6b3a039f9cd75b4e90f7f6cf4 (patch) | |
tree | 5fc9ac1981816c8d47f51c1fbfa4a07e0ef92793 | |
parent | 4e3461d34f4cd632b403342ea1df33135e5e3ad3 (diff) |
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>
-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 = { | |||
140 | 140 | ||
141 | static int broadwell_rtd_init(struct snd_soc_pcm_runtime *rtd) | 141 | static int broadwell_rtd_init(struct snd_soc_pcm_runtime *rtd) |
142 | { | 142 | { |
143 | struct snd_soc_codec *codec = rtd->codec; | ||
144 | struct snd_soc_dapm_context *dapm = &codec->dapm; | ||
145 | struct sst_pdata *pdata = dev_get_platdata(rtd->platform->dev); | 143 | struct sst_pdata *pdata = dev_get_platdata(rtd->platform->dev); |
146 | struct sst_hsw *broadwell = pdata->dsp; | 144 | struct sst_hsw *broadwell = pdata->dsp; |
147 | int ret; | 145 | int ret; |
@@ -155,14 +153,6 @@ static int broadwell_rtd_init(struct snd_soc_pcm_runtime *rtd) | |||
155 | return ret; | 153 | return ret; |
156 | } | 154 | } |
157 | 155 | ||
158 | /* always connected - check HP for jack detect */ | ||
159 | snd_soc_dapm_enable_pin(dapm, "Headphone Jack"); | ||
160 | snd_soc_dapm_enable_pin(dapm, "Speaker"); | ||
161 | snd_soc_dapm_enable_pin(dapm, "Mic Jack"); | ||
162 | snd_soc_dapm_enable_pin(dapm, "Line Jack"); | ||
163 | snd_soc_dapm_enable_pin(dapm, "DMIC1"); | ||
164 | snd_soc_dapm_enable_pin(dapm, "DMIC2"); | ||
165 | |||
166 | return 0; | 156 | return 0; |
167 | } | 157 | } |
168 | 158 | ||