aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-03-04 20:17:48 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-03-06 13:37:10 +0000
commita1b3eaeb146937e954cdb6dcb67f8761b73e2eef (patch)
tree7da0279408e45859c7b547721bd345db44ac14aa
parentc36623a7543e7a23ceeafbeb7b34a9e020100898 (diff)
ASoC: Refresh JIVE driver
Remove uneeded startup callback and use snd_soc_dapm_nc_pin() Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/s3c24xx/jive_wm8750.c27
1 files changed, 6 insertions, 21 deletions
diff --git a/sound/soc/s3c24xx/jive_wm8750.c b/sound/soc/s3c24xx/jive_wm8750.c
index 7dfe26ea8f4..32063790d95 100644
--- a/sound/soc/s3c24xx/jive_wm8750.c
+++ b/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,