ASoC: broadwell: Drop unnecessary snd_soc_dapm_enable() calls
authorLars-Peter Clausen <lars@metafoo.de>
Thu, 1 Jan 2015 10:30:35 +0000 (11:30 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 6 Jan 2015 17:24:25 +0000 (17:24 +0000)
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>
sound/soc/intel/broadwell.c

index 7cf95d5d5d808f77d0558ecb8a521bdd1e26f541..9cf7d01479adcbd82661c70344b5f5d4ad0969fe 100644 (file)
@@ -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;
 }