lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ASoC: Refresh JIVE driver

Browse Source 
Remove uneeded startup callback and use snd_soc_dapm_nc_pin()

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Mark Brown
2009-03-04 20:17:48 +00:00
parent c36623a754
commit a1b3eaeb14
1 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
sound/soc/s3c24xx/jive_wm8750.c
View File

@@ -45,20 +45,6 @@ static const struct snd_soc_dapm_widget wm8750_dapm_widgets[] = {
SND_SOC_DAPM_LINE("Line In", NULL), 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, static int jive_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params) 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 = { static struct snd_soc_ops jive_ops = {
.startup = jive_startup,
.hw_params = jive_hw_params, .hw_params = jive_hw_params,
}; };
@@ -128,12 +113,12 @@ static int jive_wm8750_init(struct snd_soc_codec *codec)
int err; int err;
/* These endpoints are not being used. */ /* These endpoints are not being used. */
snd_soc_dapm_disable_pin(codec, "LINPUT2"); snd_soc_dapm_nc_pin(codec, "LINPUT2");
snd_soc_dapm_disable_pin(codec, "RINPUT2"); snd_soc_dapm_nc_pin(codec, "RINPUT2");
snd_soc_dapm_disable_pin(codec, "LINPUT3"); snd_soc_dapm_nc_pin(codec, "LINPUT3");
snd_soc_dapm_disable_pin(codec, "RINPUT3"); snd_soc_dapm_nc_pin(codec, "RINPUT3");
snd_soc_dapm_disable_pin(codec, "OUT3"); snd_soc_dapm_nc_pin(codec, "OUT3");
snd_soc_dapm_disable_pin(codec, "MONO"); snd_soc_dapm_nc_pin(codec, "MONO");
/* Add jive specific widgets */ /* Add jive specific widgets */
err = snd_soc_dapm_new_controls(codec, wm8750_dapm_widgets, err = snd_soc_dapm_new_controls(codec, wm8750_dapm_widgets,