diff mbox

ASoC: boardwell: Drop unnecessary snd_soc_dapm_enable() calls

Message ID 1420108235-30798-1-git-send-email-lars@metafoo.de (mailing list archive)
State Accepted
Commit 057a1573fd1309a6b3a039f9cd75b4e90f7f6cf4
Headers show

Commit Message

Lars-Peter Clausen Jan. 1, 2015, 10:30 a.m. UTC 
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>
---
 sound/soc/intel/broadwell.c | 10 ----------
 1 file changed, 10 deletions(-)

Comments

Mark Brown Jan. 5, 2015, 8:12 p.m. UTC | #1 
On Thu, Jan 01, 2015 at 11:30:35AM +0100, Lars-Peter Clausen wrote:
> DAPM widgets are enabled by default, there is no need to enable them unless
> they have previously been explicitly disabled.

Applied, thanks.
diff mbox

Patch

diff --git a/sound/soc/intel/broadwell.c b/sound/soc/intel/broadwell.c
index 7cf95d5..9cf7d01 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;
 }