Commit 057a1573 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

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: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 4e3461d3

sound/soc/intel/broadwell.c

+0 −10
Original line number Diff line number Diff line
@@ -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;

}