summaryrefslogtreecommitdiffstats
path: root/sound/soc/samsung/rx1950_uda1380.c
diff options
context:
space:
mode:
authorJarkko Nikula <jarkko.nikula@linux.intel.com>2014-05-19 16:17:27 +0300
committerMark Brown <broonie@linaro.org>2014-05-19 17:19:18 +0100
commitd77a14b579f6bfe2d149d3bcc5bd306e20d2d652 (patch)
tree5e40d7fa7a209b113a5ce0a27677e7f91ce8809b /sound/soc/samsung/rx1950_uda1380.c
parent831ffa45e7465e45ab2244da6bbed6bead47b6bc (diff)
downloadblackbird-op-linux-d77a14b579f6bfe2d149d3bcc5bd306e20d2d652.tar.gz
blackbird-op-linux-d77a14b579f6bfe2d149d3bcc5bd306e20d2d652.zip
ASoC: Remove needless snd_soc_dapm_enable_pin() from machine driver inits
ALSA SoC core marks widgets as connected by default when they are initialized in snd_soc_dapm_new_control() so there is no need to call snd_soc_dapm_enable_pin() from machine driver init functions. Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/samsung/rx1950_uda1380.c')
-rw-r--r--sound/soc/samsung/rx1950_uda1380.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/sound/soc/samsung/rx1950_uda1380.c b/sound/soc/samsung/rx1950_uda1380.c
index 2982d9e7f268..5b3e504d3a32 100644
--- a/sound/soc/samsung/rx1950_uda1380.c
+++ b/sound/soc/samsung/rx1950_uda1380.c
@@ -221,11 +221,6 @@ static int rx1950_hw_params(struct snd_pcm_substream *substream,
static int rx1950_uda1380_init(struct snd_soc_pcm_runtime *rtd)
{
struct snd_soc_codec *codec = rtd->codec;
- struct snd_soc_dapm_context *dapm = &codec->dapm;
-
- 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_jack_new(codec, "Headphone Jack", SND_JACK_HEADPHONE,
&hp_jack);
OpenPOWER on IntegriCloud