From afd120c4d7f736c479291789492b99162546c049 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Wed, 4 Mar 2009 20:17:48 +0000 Subject: [PATCH] --- yaml --- r: 132883 b: refs/heads/master c: a1b3eaeb146937e954cdb6dcb67f8761b73e2eef h: refs/heads/master i: 132881: e37fd7954f568083aa11bbf3ac4c000fa6efaf17 132879: d1011ee238943a2a534c11dfc972dc7eb0252109 v: v3 --- [refs] | 2 +- trunk/sound/soc/s3c24xx/jive_wm8750.c | 27 ++++++--------------------- 2 files changed, 7 insertions(+), 22 deletions(-) diff --git a/[refs] b/[refs] index cd1173c55beb..3386ae66dc6f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c36623a7543e7a23ceeafbeb7b34a9e020100898 +refs/heads/master: a1b3eaeb146937e954cdb6dcb67f8761b73e2eef diff --git a/trunk/sound/soc/s3c24xx/jive_wm8750.c b/trunk/sound/soc/s3c24xx/jive_wm8750.c index 7dfe26ea8f40..32063790d95b 100644 --- a/trunk/sound/soc/s3c24xx/jive_wm8750.c +++ b/trunk/sound/soc/s3c24xx/jive_wm8750.c @@ -45,20 +45,6 @@ static const struct snd_soc_dapm_widget wm8750_dapm_widgets[] = { SND_SOC_DAPM_LINE("Line In", NULL), }; -static int jive_startup(struct snd_pcm_substream *substream) -{ - struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_codec *codec = rtd->socdev->codec; - - snd_soc_dapm_enable_pin(codec, "Headphone Jack"); - snd_soc_dapm_enable_pin(codec, "Internal Speaker"); - snd_soc_dapm_enable_pin(codec, "Line In"); - - snd_soc_dapm_sync(codec); - - return 0; -} - static int jive_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { @@ -119,7 +105,6 @@ static int jive_hw_params(struct snd_pcm_substream *substream, } static struct snd_soc_ops jive_ops = { - .startup = jive_startup, .hw_params = jive_hw_params, }; @@ -128,12 +113,12 @@ static int jive_wm8750_init(struct snd_soc_codec *codec) int err; /* These endpoints are not being used. */ - snd_soc_dapm_disable_pin(codec, "LINPUT2"); - snd_soc_dapm_disable_pin(codec, "RINPUT2"); - snd_soc_dapm_disable_pin(codec, "LINPUT3"); - snd_soc_dapm_disable_pin(codec, "RINPUT3"); - snd_soc_dapm_disable_pin(codec, "OUT3"); - snd_soc_dapm_disable_pin(codec, "MONO"); + snd_soc_dapm_nc_pin(codec, "LINPUT2"); + snd_soc_dapm_nc_pin(codec, "RINPUT2"); + snd_soc_dapm_nc_pin(codec, "LINPUT3"); + snd_soc_dapm_nc_pin(codec, "RINPUT3"); + snd_soc_dapm_nc_pin(codec, "OUT3"); + snd_soc_dapm_nc_pin(codec, "MONO"); /* Add jive specific widgets */ err = snd_soc_dapm_new_controls(codec, wm8750_dapm_widgets,